Merged in thomas_beale/pygments-main (pull request #483)

Add lexer and test files for the Archetype Definition Language (ADL) and sub-sytaxes.

6 files changed, 980 insertions, 235 deletions

diff --git a/tests/examplefiles/99_bottles_of_beer.chpl b/tests/examplefiles/99_bottles_of_beer.chpl
index 47fcaaf6..3629028d 100644
--- a/tests/examplefiles/99_bottles_of_beer.chpl
+++ b/tests/examplefiles/99_bottles_of_beer.chpl
@@ -159,3 +159,16 @@ var wideOpen = 0o777,
   clique_y = 0O660,
   zeroOct = 0o0,
   minPosOct = 0O1;
+
+private module M3 {
+  private proc foo() {
+
+  }
+
+  private iter bar() {
+
+  }
+
+  private var x: int;
+
+}
\ No newline at end of file
diff --git a/tests/examplefiles/ahcon.f b/tests/examplefiles/ahcon.f
new file mode 100644
index 00000000..48ae920b
--- /dev/null
+++ b/tests/examplefiles/ahcon.f
@@ -0,0 +1,340 @@
+        SUBROUTINE AHCON (SIZE,N,M,A,B,OLEVR,OLEVI,CLEVR,CLEVI,         TRUNCATED
+     &                    SCR1,SCR2,IPVT,JPVT,CON,WORK,ISEED,IERR) !Test inline comment
+C
+C       FUNCTION:
+CF
+CF      Determines whether the pair (A,B) is controllable and flags
+CF      the eigenvalues corresponding to uncontrollable modes.
+CF      this ad-hoc controllability calculation uses a random matrix F
+CF      and computes whether eigenvalues move from A to the controlled
+CF      system A+B*F.
+CF
+C       USAGE:
+CU
+CU      CALL AHCON (SIZE,N,M,A,B,OLEVR,OLEVI,CLEVR,CLEVI,SCR1,SCR2,IPVT,
+CU                  JPVT,CON,WORK,ISEED,IERR)
+CU
+CU      since AHCON generates different random F matrices for each
+CU      call, as long as iseed is not re-initialized by the main
+CU      program, and since this code has the potential to be fooled
+CU      by extremely ill-conditioned problems, the cautious user
+CU      may wish to call it multiple times and rely, perhaps, on
+CU      a 2-of-3 vote.  We believe, but have not proved, that any
+CU      errors this routine may produce are conservative--i.e., that
+CU      it may flag a controllable mode as uncontrollable, but
+CU      not vice-versa.
+CU
+C       INPUTS:
+CI
+CI      SIZE    integer - first dimension of all 2-d arrays.
+CI
+CI      N       integer - number of states.
+CI
+CI      M       integer - number of inputs.
+CI
+CI      A       double precision - SIZE by N array containing the
+CI              N by N system dynamics matrix A.
+CI
+CI      B       double precision - SIZE by M array containing the
+CI              N by M system input matrix B.
+CI
+CI      ISEED   initial seed for random number generator; if ISEED=0,
+CI              then AHCON will set ISEED to a legal value.
+CI
+C       OUTPUTS:
+CO
+CO      OLEVR   double precision - N dimensional vector containing the
+CO              real parts of the eigenvalues of A.
+CO
+CO      OLEVI   double precision - N dimensional vector containing the
+CO              imaginary parts of the eigenvalues of A.
+CO
+CO      CLEVR   double precision - N dimensional vector work space
+CO              containing the real parts of the eigenvalues of A+B*F,
+CO              where F is the random matrix.
+CO
+CO      CLEVI   double precision - N dimensional vector work space
+CO              containing the imaginary parts of the eigenvalues of
+CO              A+B*F, where F is the random matrix.
+CO
+CO      SCR1    double precision - N dimensional vector containing the
+CO              magnitudes of the corresponding eigenvalues of A.
+CO
+CO      SCR2    double precision - N dimensional vector containing the
+CO              damping factors of the corresponding eigenvalues of A.
+CO
+CO      IPVT    integer - N dimensional vector; contains the row pivots
+CO              used in finding the nearest neighbor eigenvalues between
+CO              those of A and of A+B*F.  The IPVT(1)th eigenvalue of
+CO              A and the JPVT(1)th eigenvalue of A+B*F are the closest
+CO              pair.
+CO
+CO      JPVT    integer - N dimensional vector; contains the column
+CO              pivots used in finding the nearest neighbor eigenvalues;
+CO              see IPVT.
+CO
+CO      CON     logical - N dimensional vector; flagging the uncontrollable
+CO              modes of the system.  CON(I)=.TRUE. implies the
+CO              eigenvalue of A given by DCMPLX(OLEVR(IPVT(I)),OLEVI(IPVT(i)))
+CO              corresponds to a controllable mode; CON(I)=.FALSE.
+CO              implies an uncontrollable mode for that eigenvalue.
+CO
+CO      WORK    double precision - SIZE by N dimensional array containing
+CO              an N by N matrix.  WORK(I,J) is the distance between
+CO              the open loop eigenvalue given by DCMPLX(OLEVR(I),OLEVI(I))
+CO              and the closed loop eigenvalue of A+B*F given by
+CO              DCMPLX(CLEVR(J),CLEVI(J)).
+CO
+CO      IERR    integer - IERR=0 indicates normal return; a non-zero
+CO              value indicates trouble in the eigenvalue calculation.
+CO              see the EISPACK and EIGEN documentation for details.
+CO
+C       ALGORITHM:
+CA
+CA      Calculate eigenvalues of A and of A+B*F for a randomly
+CA      generated F, and see which ones change.  Use a full pivot
+CA      search through a matrix of euclidean distance measures
+CA      between each pair of eigenvalues from (A,A+BF) to
+CA      determine the closest pairs.
+CA
+C       MACHINE DEPENDENCIES:
+CM
+CM       NONE
+CM
+C       HISTORY:
+CH
+CH      written by:             Birdwell & Laub
+CH      date:                   May 18, 1985
+CH      current version:        1.0
+CH      modifications:          made machine independent and modified for
+CH                              f77:bb:8-86.
+CH                              changed cmplx -> dcmplx: 7/27/88 jdb
+CH
+C       ROUTINES CALLED:
+CC
+CC      EIGEN,RAND
+CC
+C       COMMON MEMORY USED:
+CM
+CM      none
+CM
+C----------------------------------------------------------------------
+C       written for:    The CASCADE Project
+C                       Oak Ridge National Laboratory
+C                       U.S. Department of Energy
+C                       contract number DE-AC05-840R21400
+C                       subcontract number 37B-7685 S13
+C                       organization:   The University of Tennessee
+C----------------------------------------------------------------------
+C       THIS SOFTWARE IS IN THE PUBLIC DOMAIN
+C       NO RESTRICTIONS ON ITS USE ARE IMPLIED
+C----------------------------------------------------------------------
+C
+C--global variables:
+C
+        INTEGER         SIZE
+        INTEGER         N
+        INTEGER         M
+        INTEGER         IPVT(1)
+        INTEGER         JPVT(1)
+        INTEGER         IERR
+C
+        DOUBLE PRECISION        A(SIZE,N)
+        DOUBLE PRECISION        B(SIZE,M)
+        DOUBLE PRECISION        WORK(SIZE,N)
+        DOUBLE PRECISION        CLEVR(N)
+        DOUBLE PRECISION        CLEVI(N)
+        DOUBLE PRECISION        OLEVR(N)
+        DOUBLE PRECISION        OLEVI(N)
+        DOUBLE PRECISION        SCR1(N)
+        DOUBLE PRECISION        SCR2(N)
+C
+        LOGICAL                 CON(N)
+C
+C--local variables:
+C
+        INTEGER         ISEED
+        INTEGER         ITEMP
+        INTEGER         K1
+        INTEGER         K2
+        INTEGER         I
+        INTEGER         J
+        INTEGER         K
+        INTEGER         IMAX
+        INTEGER         JMAX
+C
+        DOUBLE PRECISION        VALUE
+        DOUBLE PRECISION        EPS
+        DOUBLE PRECISION        EPS1
+        DOUBLE PRECISION        TEMP
+        DOUBLE PRECISION        CURR
+        DOUBLE PRECISION        ANORM
+        DOUBLE PRECISION        BNORM
+        DOUBLE PRECISION        COLNRM
+        DOUBLE PRECISION        RNDMNO
+C
+        DOUBLE COMPLEX		DCMPLX
+C
+C--compute machine epsilon
+C
+        EPS = 1.D0
+100     CONTINUE
+          EPS = EPS / 2.D0
+          EPS1 = 1.D0 + EPS
+        IF (EPS1 .NE. 1.D0) GO TO 100
+        EPS = EPS * 2.D0
+C
+C--compute the l-1 norm of a
+C
+        ANORM = 0.0D0
+        DO 120 J = 1, N
+          COLNRM = 0.D0
+          DO 110 I = 1, N
+            COLNRM = COLNRM + ABS(A(I,J))
+110       CONTINUE
+          IF (COLNRM .GT. ANORM) ANORM = COLNRM
+120     CONTINUE
+C
+C--compute the l-1 norm of b
+C
+        BNORM = 0.0D0
+        DO 140 J = 1, M
+          COLNRM = 0.D0
+          DO 130 I = 1, N
+            COLNRM = COLNRM + ABS(B(I,J))
+130       CONTINUE
+          IF (COLNRM .GT. BNORM) BNORM = COLNRM
+140     CONTINUE
+C
+C--compute a + b * f
+C
+        DO 160 J = 1, N
+          DO 150 I = 1, N
+            WORK(I,J) = A(I,J)
+150       CONTINUE
+160     CONTINUE
+C
+C--the elements of f are random with uniform distribution
+C--from -anorm/bnorm to +anorm/bnorm
+C--note that f is not explicitly stored as a matrix
+C--pathalogical floating point notes:  the if (bnorm .gt. 0.d0)
+C--test should actually be if (bnorm .gt. dsmall), where dsmall
+C--is the smallest representable number whose reciprocal does
+C--not generate an overflow or loss of precision.
+C
+        IF (ISEED .EQ. 0) ISEED = 86345823
+        IF (ANORM .EQ. 0.D0) ANORM = 1.D0
+        IF (BNORM .GT. 0.D0) THEN
+          TEMP = 2.D0 * ANORM / BNORM
+        ELSE
+          TEMP = 2.D0
+        END IF
+        DO 190 K = 1, M
+          DO 180 J = 1, N
+            CALL RAND(ISEED,ISEED,RNDMNO)
+            VALUE = (RNDMNO - 0.5D0) * TEMP
+            DO 170 I = 1, N
+              WORK(I,J) = WORK(I,J) + B(I,K)*VALUE
+170         CONTINUE
+180       CONTINUE
+190     CONTINUE
+C
+C--compute the eigenvalues of a + b*f, and several other things
+C
+        CALL EIGEN (0,SIZE,N,WORK,CLEVR,CLEVI,WORK,SCR1,SCR2,IERR)
+        IF (IERR .NE. 0) RETURN
+C
+C--copy a so it is not destroyed
+C
+        DO 210 J = 1, N
+          DO 200 I = 1, N
+            WORK(I,J) = A(I,J)
+200       CONTINUE
+210     CONTINUE
+C
+C--compute the eigenvalues of a, and several other things
+C
+        CALL EIGEN (0,SIZE,N,WORK,OLEVR,OLEVI,WORK,SCR1,SCR2,IERR)
+        IF (IERR .NE. 0) RETURN
+C
+C--form the matrix of distances between eigenvalues of a and
+C--EIGENVALUES OF A+B*F
+C
+        DO 230 J = 1, N
+          DO 220 I = 1, N
+            WORK(I,J) =
+     &        ABS(DCMPLX(OLEVR(I),OLEVI(I))-DCMPLX(CLEVR(J),CLEVI(J)))
+220       CONTINUE
+230     CONTINUE
+C
+C--initialize row and column pivots
+C
+        DO 240 I = 1, N
+          IPVT(I) = I
+          JPVT(I) = I
+240     CONTINUE
+C
+C--a little bit messy to avoid swapping columns and
+C--rows of work
+C
+        DO 270 I = 1, N-1
+C
+C--find the minimum element of each lower right square
+C--submatrix of work, for submatrices of size n x n
+C--through 2 x 2
+C
+          CURR = WORK(IPVT(I),JPVT(I))
+          IMAX = I
+          JMAX = I
+          TEMP = CURR
+C
+C--find the minimum element
+C
+          DO 260 K1 = I, N
+            DO 250 K2 = I, N
+              IF (WORK(IPVT(K1),JPVT(K2)) .LT. TEMP) THEN
+                TEMP = WORK(IPVT(K1),JPVT(K2))
+                IMAX = K1
+                JMAX = K2
+              END IF
+250         CONTINUE
+260       CONTINUE
+C
+C--update row and column pivots for indirect addressing of work
+C
+          ITEMP = IPVT(I)
+          IPVT(I) = IPVT(IMAX)
+          IPVT(IMAX) = ITEMP
+C
+          ITEMP = JPVT(I)
+          JPVT(I) = JPVT(JMAX)
+          JPVT(JMAX) = ITEMP
+C
+C--do next submatrix
+C
+270     CONTINUE
+C
+C--this threshold for determining when an eigenvalue has
+C--not moved, and is therefore uncontrollable, is critical,
+C--and may require future changes with more experience.
+C
+        EPS1 = SQRT(EPS)
+C
+C--for each eigenvalue pair, decide if it is controllable
+C
+        DO 280 I = 1, N
+C
+C--note that we are working with the "pivoted" work matrix
+C--and are looking at its diagonal elements
+C
+          IF (WORK(IPVT(I),JPVT(I))/ANORM .LE. EPS1) THEN
+            CON(I) = .FALSE.
+          ELSE
+            CON(I) = .TRUE.
+          END IF
+280     CONTINUE
+C
+C--finally!
+C
+        RETURN
+        END
diff --git a/tests/examplefiles/eval.rs b/tests/examplefiles/eval.rs
new file mode 100644
index 00000000..17e585a0
--- /dev/null
+++ b/tests/examplefiles/eval.rs
@@ -0,0 +1,606 @@
+// -------------------------------------------------------------------------------------------------
+// Rick, a Rust intercal compiler.  Save your souls!
+//
+// Copyright (c) 2015 Georg Brandl
+//
+// This program is free software; you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+// even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program;
+// if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// -------------------------------------------------------------------------------------------------
+
+/// Interprets INTERCAL source.
+///
+/// The evaluator is used when rick is called with `-i`, or when the compiler generates
+/// the output while compiling (in the constant-output case).
+
+use std::fmt::{ Debug, Display };
+use std::io::Write;
+use std::u16;
+
+use err::{ Res, IE123, IE129, IE252, IE275, IE555, IE633, IE774, IE994 };
+use ast::{ self, Program, Stmt, StmtBody, ComeFrom, Expr, Var, VType };
+use stdops::{ Bind, Array, write_number, read_number, check_chance, check_ovf, pop_jumps,
+              get_random_seed, mingle, select, and_16, and_32, or_16, or_32, xor_16, xor_32 };
+
+
+/// Represents a value (either 16-bit or 32-bit) at runtime.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum Val {
+    I16(u16),
+    I32(u32),
+}
+
+impl Val {
+    /// Cast as a 16-bit value; returns an error if 32-bit and too big.
+    pub fn as_u16(&self) -> Res<u16> {
+        match *self {
+            Val::I16(v) => Ok(v),
+            Val::I32(v) => {
+                if v > (u16::MAX as u32) {
+                    return IE275.err();
+                }
+                Ok(v as u16)
+            }
+        }
+    }
+
+    /// Cast as a 32-bit value; always succeeds.
+    pub fn as_u32(&self) -> u32 {
+        match *self {
+            Val::I16(v) => v as u32,
+            Val::I32(v) => v
+        }
+    }
+
+    /// Cast as an usize value; always succeeds.
+    pub fn as_usize(&self) -> usize {
+        self.as_u32() as usize
+    }
+
+    /// Create from a 32-bit value; will select the smallest possible type.
+    pub fn from_u32(v: u32) -> Val {
+        if v & 0xFFFF == v {
+            Val::I16(v as u16)
+        } else {
+            Val::I32(v)
+        }
+    }
+}
+
+/// The state of the interpreter's evaluator.
+pub struct Eval<'a> {
+    /// Program to execute.
+    program: &'a Program,
+    /// Stream to use for printing output.
+    stdout: &'a mut Write,
+    /// Whether to print debugging output during execution.
+    debug: bool,
+    /// Variable bindings for the four types of variables.
+    spot: Vec<Bind<u16>>,
+    twospot: Vec<Bind<u32>>,
+    tail: Vec<Bind<Array<u16>>>,
+    hybrid: Vec<Bind<Array<u32>>>,
+    /// The infamous NEXT stack, capable of holding 80 elements.
+    jumps: Vec<ast::LogLine>,
+    /// Abstain counter for each statement.
+    abstain: Vec<u32>,
+    /// Binary I/O "tape" state.
+    last_in: u8,
+    last_out: u8,
+    /// Random number generator state.
+    rand_st: u32,
+    /// Counts the number of executed statements.
+    stmt_ctr: usize,
+}
+
+/// Represents the control flow effect of an executed statement.
+enum StmtRes {
+    /// normal execution, next statement
+    Next,
+    /// jump around, from DO ... NEXT
+    Jump(usize),
+    /// jump back, from RESUME
+    Back(usize),
+    /// start from the first statement, from TRY AGAIN
+    FromTop,
+    /// end the program, from GIVE UP
+    End,
+}
+
+impl<'a> Eval<'a> {
+    /// Construct a new evaluator.
+    pub fn new(program: &'a Program, stdout: &'a mut Write, debug: bool,
+               random: bool) -> Eval<'a> {
+        let abs = program.stmts.iter().map(|stmt| stmt.props.disabled as u32).collect();
+        let nvars = (program.var_info.0.len(),
+                     program.var_info.1.len(),
+                     program.var_info.2.len(),
+                     program.var_info.3.len());
+        Eval {
+            program:  program,
+            stdout:   stdout,
+            debug:    debug,
+            spot:     vec![Bind::new(0); nvars.0],
+            twospot:  vec![Bind::new(0); nvars.1],
+            tail:     vec![Bind::new(Array::empty()); nvars.2],
+            hybrid:   vec![Bind::new(Array::empty()); nvars.3],
+            jumps:    Vec::with_capacity(80),
+            rand_st:  if random { get_random_seed() } else { 0 },
+            abstain:  abs,
+            last_in:  0,
+            last_out: 0,
+            stmt_ctr: 0,
+        }
+    }
+
+    /// Interpret the program.  Returns either the number of executed statements,
+    /// or an error (RtError).
+    pub fn eval(&mut self) -> Res<usize> {
+        let mut pctr = 0;  // index of current statement
+        let program = self.program.clone();
+        let nstmts = program.stmts.len();
+        loop {
+            // check for falling off the end
+            if pctr >= nstmts {
+                // if the last statement was a TRY AGAIN, falling off the end is fine
+                if let StmtBody::TryAgain = program.stmts[program.stmts.len() - 1].body {
+                    break;
+                }
+                return IE633.err();
+            }
+            self.stmt_ctr += 1;
+            let stmt = &program.stmts[pctr];
+            // execute statement if not abstained
+            if self.abstain[pctr] == 0 {
+                // check execution chance
+                let (passed, rand_st) = check_chance(stmt.props.chance, self.rand_st);
+                self.rand_st = rand_st;
+                if passed {
+                    // try to eval this statement
+                    let res = match self.eval_stmt(stmt) {
+                        // on error, set the correct line number and bubble up
+                        Err(mut err) => {
+                            err.set_line(stmt.props.onthewayto);
+                            // special treatment for NEXT
+                            if let StmtBody::DoNext(n) = stmt.body {
+                                if let Some(i) = program.labels.get(&n) {
+                                    err.set_line(program.stmts[*i as usize].props.srcline);
+                                }
+                            }
+                            return Err(err);
+                        }
+                        Ok(res)  => res
+                    };
+                    // handle control flow effects
+                    match res {
+                        StmtRes::Next    => { }
+                        StmtRes::Jump(n) => {
+                            self.jumps.push(pctr as u16);  // push the line with the NEXT
+                            pctr = n;
+                            continue;  // do not increment or check for COME FROMs
+                        }
+                        StmtRes::Back(n) => {
+                            pctr = n;  // will be incremented below after COME FROM check
+                        }
+                        StmtRes::FromTop => {
+                            pctr = 0;  // start from the beginning, do not push any stack
+                            continue;
+                        }
+                        StmtRes::End     => break,
+                    }
+                }
+            }
+            // if we are on the line with the compiler bug, error out
+            if pctr == self.program.bugline as usize {
+                return IE774.err_with(None, stmt.props.onthewayto);
+            }
+            // try to determine if we have to go to a COME FROM statement
+            // (note: in general, program.stmts[pctr] != stmt)
+            //
+            // the static COME FROM is always a possibility
+            let mut maybe_next = program.stmts[pctr].comefrom;
+            // the complicated case: evaluate all computed-come-from expressions
+            let my_label = program.stmts[pctr].props.label;
+            if program.uses_complex_comefrom && my_label > 0 {
+                for (i, stmt) in program.stmts.iter().enumerate() {
+                    if let StmtBody::ComeFrom(ComeFrom::Expr(ref e)) = stmt.body {
+                        let v = try!(try!(self.eval_expr(e)).as_u16());
+                        if v == my_label {
+                            // as soon as we have multiple candidates, we can bail out
+                            if maybe_next.is_some() {
+                                return IE555.err();
+                            }
+                            maybe_next = Some(i as u16);
+                        }
+                    }
+                }
+            }
+            // check for COME FROMs from this line
+            if let Some(next) = maybe_next {
+                let next = next as usize;
+                // check for abstained COME FROM
+                if self.abstain[next] == 0 {
+                    // the COME FROM can also have a % chance
+                    let (passed, rand_st) = check_chance(program.stmts[next].props.chance,
+                                                         self.rand_st);
+                    self.rand_st = rand_st;
+                    if passed {
+                        pctr = next;
+                        continue;
+                    }
+                }
+            }
+            // no COME FROM, normal execution
+            pctr += 1;
+        }
+        Ok(self.stmt_ctr)
+    }
+
+    /// Interpret a single statement.
+    fn eval_stmt(&mut self, stmt: &Stmt) -> Res<StmtRes> {
+        if self.debug {
+            println!("\nExecuting Stmt #{} (state before following)", self.stmt_ctr);
+            self.dump_state();
+            println!("{}", stmt);
+        }
+        match stmt.body {
+            StmtBody::Calc(ref var, ref expr) => {
+                let val = try!(self.eval_expr(expr));
+                try!(self.assign(var, val));
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Dim(ref var, ref exprs) => {
+                try!(self.array_dim(var, exprs));
+                Ok(StmtRes::Next)
+            }
+            StmtBody::DoNext(n) => {
+                match self.program.labels.get(&n) {
+                    // too many jumps on stack already?
+                    Some(_) if self.jumps.len() >= 80 => IE123.err(),
+                    Some(i)                           => Ok(StmtRes::Jump(*i as usize)),
+                    None                              => IE129.err(),
+                }
+            }
+            StmtBody::ComeFrom(_) => {
+                // nothing to do here at runtime
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Resume(ref expr) => {
+                let n = try!(self.eval_expr(expr)).as_u32();
+                // this expect() is safe: if the third arg is true, there will
+                // be no Ok(None) returns
+                let next = try!(pop_jumps(&mut self.jumps, n, true, 0))
+                    .expect("https://xkcd.com/378/ ?!");
+                Ok(StmtRes::Back(next as usize))
+            }
+            StmtBody::Forget(ref expr) => {
+                let n = try!(self.eval_expr(expr)).as_u32();
+                try!(pop_jumps(&mut self.jumps, n, false, 0));
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Ignore(ref vars) => {
+                for var in vars {
+                    self.set_rw(var, false);
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Remember(ref vars) => {
+                for var in vars {
+                    self.set_rw(var, true);
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Stash(ref vars) => {
+                for var in vars {
+                    self.stash(var);
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Retrieve(ref vars) => {
+                for var in vars {
+                    try!(self.retrieve(var));
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Abstain(ref expr, ref whats) => {
+                let f: Box<Fn(u32) -> u32> = if let Some(ref e) = *expr {
+                    let n = try!(self.eval_expr(e)).as_u32();
+                    box move |v: u32| v.saturating_add(n)
+                } else {
+                    box |_| 1
+                };
+                for what in whats {
+                    self.abstain(what, &*f);
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::Reinstate(ref whats) => {
+                for what in whats {
+                    self.abstain(what, &|v: u32| v.saturating_sub(1));
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::ReadOut(ref vars) => {
+                for var in vars {
+                    match *var {
+                        // read out whole array
+                        Expr::Var(ref var) if var.is_dim() => {
+                            try!(self.array_readout(var));
+                        }
+                        // read out single var or array element
+                        Expr::Var(ref var) => {
+                            let varval = try!(self.lookup(var));
+                            try!(write_number(self.stdout, varval.as_u32(), 0));
+                        }
+                        // read out constant
+                        Expr::Num(_, v) => try!(write_number(self.stdout, v, 0)),
+                        // others will not be generated
+                        _ => return IE994.err(),
+                    };
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::WriteIn(ref vars) => {
+                for var in vars {
+                    if var.is_dim() {
+                        // write in whole array
+                        try!(self.array_writein(var));
+                    } else {
+                        // write in single var or array element
+                        let n = try!(read_number(0));
+                        try!(self.assign(var, Val::from_u32(n)));
+                    }
+                }
+                Ok(StmtRes::Next)
+            }
+            // this one is only generated by the constant-program optimizer
+            StmtBody::Print(ref s) => {
+                if let Err(_) = self.stdout.write(&s) {
+                    return IE252.err();
+                }
+                Ok(StmtRes::Next)
+            }
+            StmtBody::TryAgain => Ok(StmtRes::FromTop),
+            StmtBody::GiveUp => Ok(StmtRes::End),
+            StmtBody::Error(ref e) => Err((*e).clone()),
+        }
+    }
+
+    /// Evaluate an expression to a value.
+    fn eval_expr(&self, expr: &Expr) -> Res<Val> {
+        match *expr {
+            Expr::Num(vtype, v) => match vtype {
+                VType::I16 => Ok(Val::I16(v as u16)),
+                VType::I32 => Ok(Val::I32(v)),
+            },
+            Expr::Var(ref var) => self.lookup(var),
+            Expr::Mingle(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx)).as_u32();
+                let w = try!(self.eval_expr(wx)).as_u32();
+                let v = try!(check_ovf(v, 0));
+                let w = try!(check_ovf(w, 0));
+                Ok(Val::I32(mingle(v, w)))
+            }
+            Expr::Select(vtype, ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                if vtype == VType::I16 {
+                    Ok(Val::I16(select(v.as_u32(), try!(w.as_u16()) as u32) as u16))
+                } else {
+                    Ok(Val::I32(select(v.as_u32(), w.as_u32())))
+                }
+            }
+            Expr::And(vtype, ref vx) => {
+                let v = try!(self.eval_expr(vx));
+                match vtype {
+                    VType::I16 => Ok(Val::I16(and_16(try!(v.as_u16()) as u32) as u16)),
+                    VType::I32 => Ok(Val::I32(and_32(v.as_u32()))),
+                }
+            }
+            Expr::Or(vtype, ref vx) => {
+                let v = try!(self.eval_expr(vx));
+                match vtype {
+                    VType::I16 => Ok(Val::I16(or_16(try!(v.as_u16()) as u32) as u16)),
+                    VType::I32 => Ok(Val::I32(or_32(v.as_u32()))),
+                }
+            }
+            Expr::Xor(vtype, ref vx) => {
+                let v = try!(self.eval_expr(vx));
+                match vtype {
+                    VType::I16 => Ok(Val::I16(xor_16(try!(v.as_u16()) as u32) as u16)),
+                    VType::I32 => Ok(Val::I32(xor_32(v.as_u32()))),
+                }
+            }
+            Expr::RsNot(ref vx) => {
+                let v = try!(self.eval_expr(vx));
+                Ok(Val::I32(!v.as_u32()))
+            }
+            Expr::RsAnd(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() & w.as_u32()))
+            }
+            Expr::RsOr(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() | w.as_u32()))
+            }
+            Expr::RsXor(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() ^ w.as_u32()))
+            }
+            Expr::RsRshift(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() >> w.as_u32()))
+            }
+            Expr::RsLshift(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() << w.as_u32()))
+            }
+            // Expr::RsEqual(ref vx, ref wx) => {
+            //     let v = try!(self.eval_expr(vx));
+            //     let w = try!(self.eval_expr(wx));
+            //     Ok(Val::I32((v.as_u32() == w.as_u32()) as u32))
+            // }
+            Expr::RsNotEqual(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32((v.as_u32() != w.as_u32()) as u32))
+            }
+            Expr::RsPlus(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() + w.as_u32()))
+            }
+            Expr::RsMinus(ref vx, ref wx) => {
+                let v = try!(self.eval_expr(vx));
+                let w = try!(self.eval_expr(wx));
+                Ok(Val::I32(v.as_u32() - w.as_u32()))
+            }
+        }
+    }
+
+    #[inline]
+    fn eval_subs(&self, subs: &Vec<Expr>) -> Res<Vec<usize>> {
+        subs.iter().map(|v| self.eval_expr(v).map(|w| w.as_usize())).collect()
+    }
+
+    /// Dimension an array.
+    fn array_dim(&mut self, var: &Var, dims: &Vec<Expr>) -> Res<()> {
+        let dims = try!(self.eval_subs(dims));
+        match *var {
+            Var::A16(n, _) => self.tail[n].dimension(dims, 0),
+            Var::A32(n, _) => self.hybrid[n].dimension(dims, 0),
+            _ => return IE994.err(),
+        }
+    }
+
+    /// Assign to a variable.
+    fn assign(&mut self, var: &Var, val: Val) -> Res<()> {
+        match *var {
+            Var::I16(n) => Ok(self.spot[n].assign(try!(val.as_u16()))),
+            Var::I32(n) => Ok(self.twospot[n].assign(val.as_u32())),
+            Var::A16(n, ref subs) => {
+                let subs = try!(self.eval_subs(subs));
+                self.tail[n].set_md(subs, try!(val.as_u16()), 0)
+            }
+            Var::A32(n, ref subs) => {
+                let subs = try!(self.eval_subs(subs));
+                self.hybrid[n].set_md(subs, val.as_u32(), 0)
+            }
+        }
+    }
+
+    /// Look up the value of a variable.
+    fn lookup(&self, var: &Var) -> Res<Val> {
+        match *var {
+            Var::I16(n) => Ok(Val::I16(self.spot[n].val)),
+            Var::I32(n) => Ok(Val::I32(self.twospot[n].val)),
+            Var::A16(n, ref subs) => {
+                let subs = try!(self.eval_subs(subs));
+                self.tail[n].get_md(subs, 0).map(Val::I16)
+            }
+            Var::A32(n, ref subs) => {
+                let subs = try!(self.eval_subs(subs));
+                self.hybrid[n].get_md(subs, 0).map(Val::I32)
+            }
+        }
+    }
+
+    /// Process a STASH statement.
+    fn stash(&mut self, var: &Var) {
+        match *var {
+            Var::I16(n) => self.spot[n].stash(),
+            Var::I32(n) => self.twospot[n].stash(),
+            Var::A16(n, _) => self.tail[n].stash(),
+            Var::A32(n, _) => self.hybrid[n].stash(),
+        }
+    }
+
+    /// Process a RETRIEVE statement.
+    fn retrieve(&mut self, var: &Var) -> Res<()> {
+        match *var {
+            Var::I16(n) => self.spot[n].retrieve(0),
+            Var::I32(n) => self.twospot[n].retrieve(0),
+            Var::A16(n, _) => self.tail[n].retrieve(0),
+            Var::A32(n, _) => self.hybrid[n].retrieve(0),
+        }
+    }
+
+    /// Process an IGNORE or REMEMBER statement.  Cannot fail.
+    fn set_rw(&mut self, var: &Var, rw: bool) {
+        match *var {
+            Var::I16(n) => self.spot[n].rw = rw,
+            Var::I32(n) => self.twospot[n].rw = rw,
+            Var::A16(n, _) => self.tail[n].rw = rw,
+            Var::A32(n, _) => self.hybrid[n].rw = rw,
+        }
+    }
+
+    /// P()rocess an ABSTAIN or REINSTATE statement.  Cannot fail.
+    fn abstain(&mut self, what: &ast::Abstain, f: &Fn(u32) -> u32) {
+        if let &ast::Abstain::Label(lbl) = what {
+            let idx = self.program.labels[&lbl] as usize;
+            if self.program.stmts[idx].body != StmtBody::GiveUp {
+                self.abstain[idx] = f(self.abstain[idx]);
+            }
+        } else {
+            for (i, stype) in self.program.stmt_types.iter().enumerate() {
+                if stype == what {
+                    self.abstain[i] = f(self.abstain[i]);
+                }
+            }
+        }
+    }
+
+    /// Array readout helper.
+    fn array_readout(&mut self, var: &Var) -> Res<()> {
+        let state = &mut self.last_out;
+        match *var {
+            Var::A16(n, _) => self.tail[n].readout(self.stdout, state, 0),
+            Var::A32(n, _) => self.hybrid[n].readout(self.stdout, state, 0),
+            _ => return IE994.err(),
+        }
+    }
+
+    /// Array writein helper.
+    fn array_writein(&mut self, var: &Var) -> Res<()> {
+        let state = &mut self.last_in;
+        match *var {
+            Var::A16(n, _) => self.tail[n].writein(state, 0),
+            Var::A32(n, _) => self.hybrid[n].writein(state, 0),
+            _ => return IE994.err(),
+        }
+    }
+
+    /// Debug helpers.
+    fn dump_state(&self) {
+        self.dump_state_one(&self.spot, ".");
+        self.dump_state_one(&self.twospot, ":");
+        self.dump_state_one(&self.tail, ",");
+        self.dump_state_one(&self.hybrid, ";");
+        if self.jumps.len() > 0 {
+            println!("Next stack: {:?}", self.jumps);
+        }
+        //println!("Abstained: {:?}", self.abstain);
+    }
+
+    fn dump_state_one<T: Debug + Display>(&self, vec: &Vec<Bind<T>>, sigil: &str) {
+        if vec.len() > 0 {
+            for (i, v) in vec.iter().enumerate() {
+                print!("{}{} = {}, ", sigil, i, v);
+            }
+            println!("");
+        }
+    }
+}
diff --git a/tests/examplefiles/robotframework_test.txt b/tests/examplefiles/robotframework_test.txt
index 63ba63e6..0d8179c0 100644
--- a/tests/examplefiles/robotframework_test.txt
+++ b/tests/examplefiles/robotframework_test.txt
@@ -6,6 +6,7 @@ Test Setup       Keyword    argument   argument with ${VARIABLE}
 *** Variables ***
 ${VARIABLE}      Variable value
 @{LIST}          List    variable    here
+&{DICT}          Key1=Value1    Key2=Value2
 
 *** Test Cases ***
 Keyword-driven example
diff --git a/tests/examplefiles/rust_example.rs b/tests/examplefiles/rust_example.rs
deleted file mode 100644
index 8c44af1d..00000000
--- a/tests/examplefiles/rust_example.rs
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// based on:
-// http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
-
-/* nest some /* comments */ */
-
-extern mod std;
-
-use core::os;
-
-// Using sqrt from the standard library is way slower than using libc
-// directly even though std just calls libc, I guess it must be
-// because the the indirection through another dynamic linker
-// stub. Kind of shocking. Might be able to make it faster still with
-// an llvm intrinsic.
-#[nolink]
-extern mod libc {
-    #![legacy_exports];
-    fn sqrt(n: float) -> float;
-}
-
-fn main() {
-    let args = os::args();
-    let args = if os::getenv(~"RUST_BENCH").is_some() {
-        ~[~"", ~"4000000"]
-    } else if args.len() <= 1u {
-        ~[~"", ~"100000"]
-    } else {
-        args
-    };
-    let n = int::from_str(args[1]).get();
-    let mut bodies: ~[Body::props] = NBodySystem::make();
-    io::println(fmt!("%f", NBodySystem::energy(bodies)));
-    let mut i = 0;
-    while i < n {
-        NBodySystem::advance(bodies, 0.01);
-        i += 1;
-    }
-    io::println(fmt!("%f", NBodySystem::energy(bodies)));
-}
-
-mod NBodySystem {
-    use Body;
-
-    pub fn make() -> ~[Body::props] {
-        let mut bodies: ~[Body::props] =
-            ~[Body::sun(),
-              Body::jupiter(),
-              Body::saturn(),
-              Body::uranus(),
-              Body::neptune()];
-
-        let mut px = 0.0;
-        let mut py = 0.0;
-        let mut pz = 0.0;
-
-        let mut i = 0;
-        while i < 5 {
-            px += bodies[i].vx * bodies[i].mass;
-            py += bodies[i].vy * bodies[i].mass;
-            pz += bodies[i].vz * bodies[i].mass;
-
-            i += 1;
-        }
-
-        // side-effecting
-        Body::offset_momentum(&mut bodies[0], px, py, pz);
-
-        return bodies;
-    }
-
-    pub fn advance(bodies: &mut [Body::props], dt: float) {
-        let mut i = 0;
-        while i < 5 {
-            let mut j = i + 1;
-            while j < 5 {
-                advance_one(&mut bodies[i],
-                            &mut bodies[j], dt);
-                j += 1;
-            }
-
-            i += 1;
-        }
-
-        i = 0;
-        while i < 5 {
-            move_(&mut bodies[i], dt);
-            i += 1;
-        }
-    }
-
-    pub fn advance_one(bi: &mut Body::props,
-                       bj: &mut Body::props,
-                       dt: float) unsafe {
-        let dx = bi.x - bj.x;
-        let dy = bi.y - bj.y;
-        let dz = bi.z - bj.z;
-
-        let dSquared = dx * dx + dy * dy + dz * dz;
-
-        let distance = ::libc::sqrt(dSquared);
-        let mag = dt / (dSquared * distance);
-
-        bi.vx -= dx * bj.mass * mag;
-        bi.vy -= dy * bj.mass * mag;
-        bi.vz -= dz * bj.mass * mag;
-
-        bj.vx += dx * bi.mass * mag;
-        bj.vy += dy * bi.mass * mag;
-        bj.vz += dz * bi.mass * mag;
-    }
-
-    pub fn move_(b: &mut Body::props, dt: float) {
-        b.x += dt * b.vx;
-        b.y += dt * b.vy;
-        b.z += dt * b.vz;
-    }
-
-    pub fn energy(bodies: &[Body::props]) -> float unsafe {
-        let mut dx;
-        let mut dy;
-        let mut dz;
-        let mut distance;
-        let mut e = 0.0;
-
-        let mut i = 0;
-        while i < 5 {
-            e +=
-                0.5 * bodies[i].mass *
-                (bodies[i].vx * bodies[i].vx + bodies[i].vy * bodies[i].vy
-                 + bodies[i].vz * bodies[i].vz);
-
-            let mut j = i + 1;
-            while j < 5 {
-                dx = bodies[i].x - bodies[j].x;
-                dy = bodies[i].y - bodies[j].y;
-                dz = bodies[i].z - bodies[j].z;
-
-                distance = ::libc::sqrt(dx * dx + dy * dy + dz * dz);
-                e -= bodies[i].mass * bodies[j].mass / distance;
-
-                j += 1;
-            }
-
-            i += 1;
-        }
-        return e;
-
-    }
-}
-
-mod Body {
-    use Body;
-
-    pub const PI: float = 3.141592653589793;
-    pub const SOLAR_MASS: float = 39.478417604357432;
-    // was 4 * PI * PI originally
-    pub const DAYS_PER_YEAR: float = 365.24;
-
-    pub type props =
-        {mut x: float,
-         mut y: float,
-         mut z: float,
-         mut vx: float,
-         mut vy: float,
-         mut vz: float,
-         mass: float};
-
-    pub fn jupiter() -> Body::props {
-        return {mut x: 4.84143144246472090e+00,
-             mut y: -1.16032004402742839e+00,
-             mut z: -1.03622044471123109e-01,
-             mut vx: 1.66007664274403694e-03 * DAYS_PER_YEAR,
-             mut vy: 7.69901118419740425e-03 * DAYS_PER_YEAR,
-             mut vz: -6.90460016972063023e-05 * DAYS_PER_YEAR,
-             mass: 9.54791938424326609e-04 * SOLAR_MASS};
-    }
-
-    pub fn saturn() -> Body::props {
-        return {mut x: 8.34336671824457987e+00,
-             mut y: 4.12479856412430479e+00,
-             mut z: -4.03523417114321381e-01,
-             mut vx: -2.76742510726862411e-03 * DAYS_PER_YEAR,
-             mut vy: 4.99852801234917238e-03 * DAYS_PER_YEAR,
-             mut vz: 2.30417297573763929e-05 * DAYS_PER_YEAR,
-             mass: 2.85885980666130812e-04 * SOLAR_MASS};
-    }
-
-    pub fn uranus() -> Body::props {
-        return {mut x: 1.28943695621391310e+01,
-             mut y: -1.51111514016986312e+01,
-             mut z: -2.23307578892655734e-01,
-             mut vx: 2.96460137564761618e-03 * DAYS_PER_YEAR,
-             mut vy: 2.37847173959480950e-03 * DAYS_PER_YEAR,
-             mut vz: -2.96589568540237556e-05 * DAYS_PER_YEAR,
-             mass: 4.36624404335156298e-05 * SOLAR_MASS};
-    }
-
-    pub fn neptune() -> Body::props {
-        return {mut x: 1.53796971148509165e+01,
-             mut y: -2.59193146099879641e+01,
-             mut z: 1.79258772950371181e-01,
-             mut vx: 2.68067772490389322e-03 * DAYS_PER_YEAR,
-             mut vy: 1.62824170038242295e-03 * DAYS_PER_YEAR,
-             mut vz: -9.51592254519715870e-05 * DAYS_PER_YEAR,
-             mass: 5.15138902046611451e-05 * SOLAR_MASS};
-    }
-
-    pub fn sun() -> Body::props {
-        return {mut x: 0.0,
-             mut y: 0.0,
-             mut z: 0.0,
-             mut vx: 0.0,
-             mut vy: 0.0,
-             mut vz: 0.0,
-             mass: SOLAR_MASS};
-    }
-
-    pub fn offset_momentum(props: &mut Body::props,
-                       px: float, py: float, pz: float) {
-        props.vx = -px / SOLAR_MASS;
-        props.vy = -py / SOLAR_MASS;
-        props.vz = -pz / SOLAR_MASS;
-    }
-
-}
diff --git a/tests/examplefiles/test.gradle b/tests/examplefiles/test.gradle
new file mode 100644
index 00000000..0bc834c1
--- /dev/null
+++ b/tests/examplefiles/test.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'java'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+}
+
+task sayHello << {
+    def x = SomeClass.worldString
+    println "Hello ${x}"
+}
+
+private class SomeClass {
+    public static String getWorldString() {
+        return "world"
+    }
+}