Changeset 87

Timestamp:

06/05/08 17:05:48 (16 years ago)

Author:

ra33

Message:

Fixed some stuff with the SIMPLE debugger
Refactored the way the interpretor works to make it easier to give better error messages.

Location:

trunk

Files:

• src/org/expeditee/actions/Misc.java (modified) (1 diff)
• src/org/expeditee/actions/Simple.java (modified) (96 diffs)
• src/org/expeditee/gui/Frame.java (modified) (3 diffs)
• src/org/expeditee/gui/FrameKeyboardActions.java (modified) (11 diffs)
• src/org/expeditee/gui/FrameMouseActions.java (modified) (2 diffs)
• src/org/expeditee/gui/FrameUtils.java (modified) (1 diff)
• src/org/expeditee/items/Item.java (modified) (1 diff)
• src/org/expeditee/items/Text.java (modified) (1 diff)
• src/org/expeditee/simple/AboveMaxParametreCountException.java (added)
• src/org/expeditee/simple/Primitives.java (modified) (3 diffs)
• tests/org/expeditee/actions/SimpleTest.java (modified) (3 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -270 +270 @@
                 Frame current = DisplayIO.getCurrentFrame();
                 Item text = current.getStatsTextItem(itemText);
+                text.setSelectedMode(Item.SelectedMode.Normal);
+                text.setSelectedMode(Item.SelectedMode.None);
                 FrameMouseActions.pickup(text);
                 FrameGraphics.Repaint();

trunk/src/org/expeditee/actions/Simple.java

@@ -32 +32 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.Item.SelectedMode;
+import org.expeditee.simple.AboveMaxParametreCountException;
 import org.expeditee.simple.BelowMinParametreCountException;
 import org.expeditee.simple.Context;
@@ -116 +117 @@
         private static boolean _step;
 
-        private static int _stepPause = 0;
+        private static int _stepPause = -1;
 
         private static Color _stepColor;
@@ -123 +124 @@
 
         public static void KeyStroke(char c) {
-                
-                
                 _KeyStrokes.add(c);
         }
@@ -180 +179 @@
 
         public static void RunSimpleTests(String frameset) {
-                RunSimpleTests(frameset, false);
+                RunSimpleTests(frameset, false, true);
         }
 
         public static void RunSimpleTestsVerbose(String frameset) {
-                RunSimpleTests(frameset, true);
+                RunSimpleTests(frameset, true, true);
         }
 
@@ -197 +196 @@
 
         public void run() {
+                runSuite();
+        }
+
+        public boolean runSuite() {
                 int testsPassed = 0;
                 int testsFailed = 0;
@@ -222 +225 @@
                                 continue;
                         if (actions.get(0).toLowerCase().equals("runframe")) {
+                                boolean passed = true;
+                                String errorMessage = null;
                                 try {
                                         title.setLink(nextFrameName);
@@ -232 +237 @@
                                         RunFrameAndReportError(title, new Context());
                                         _programsRunning--;
+                                        // if the throws exception annotation is on the frame then
+                                        // it passes only if an exception is thrown
+                                        if (title.getParentOrCurrentFrame().getThrowsException()) {
+                                                errorMessage = "Expected exception " + title.toString();
+                                                passed = false;
+                                        }
+                                } catch (Exception e) {
+                                        _programsRunning--;
+                                        if (!title.getParentOrCurrentFrame().getThrowsException()) {
+                                                errorMessage = e.getMessage();
+                                                passed = false;
+                                        }
+                                }
+                                if (passed) {
                                         if (_verbose)
                                                 FrameGraphics.DisplayMessage("Test passed: "
                                                                 + title.toString(), Item.GREEN);
                                         testsPassed++;
-                                } catch (Exception e) {
+                                } else {
                                         testsFailed++;
-                                        _programsRunning--;
                                         // Print out the reason for failed tests
-                                        FrameGraphics.LinkedErrorMessage(e.getMessage());
+                                        FrameGraphics.LinkedErrorMessage(errorMessage);
                                         if (Simple._stop) {
                                                 Simple._stop = false;
-                                                return;
+                                                return false;
                                         }
                                 }
@@ -260 +278 @@
                 // Remove items from the cursor...
                 Frame.FreeItems.clear();
-        }
-
-        public static void RunSimpleTests(String frameset, boolean verbose) {
+
+                return testsFailed == 0;
+        }
+
+        /**
+         * Runs a suite of tests stored in a given frameset.
+         * 
+         * @param frameset
+         * @param verbose
+         * @param newThread
+         *            false if tests should be run on the current frame
+         */
+        public static void RunSimpleTests(String frameset, boolean verbose,
+                        boolean newThread) {
                 _stop = false;
-                Thread t = new Thread(new Simple(frameset, verbose));
-                t.setPriority(Thread.MIN_PRIORITY);
-                t.start();
+                Simple testSuite = new Simple(frameset, verbose);
+                if (newThread) {
+                        Thread t = new Thread(testSuite);
+                        t.setPriority(Thread.MIN_PRIORITY);
+                        t.start();
+                } else {
+                        assert (testSuite.runSuite());
+                }
+
         }
 
@@ -290 +325 @@
                         _KeyStrokes.clear();
 
-                        _programsRunning++;
                         Thread t = new Thread(current);
                         t.setPriority(Thread.MIN_PRIORITY);
                         t.start();
-                        // _programsRunning--;
                 } catch (Exception e) {
-                        // _programsRunning--;
                 }
         }
@@ -330 +362 @@
 
         public static void DebugFrame(Item current) {
-                DebugFrame(current, 0.2, null);
+                DebugFrame(current, -1.0, null);
         }
 
@@ -370 +402 @@
                 }
 
-                // loop through non-title, non-name, non-annotation text items
-                List<Text> body = child.getBodyTextItems(false);
+                // loop through non-title, non-name, text items
+                List<Text> body = child.getBodyTextItems(true);
 
                 // if no item was found
@@ -383 +415 @@
                                 Color oldColor = item.getBackgroundColor();
                                 if (_step) {
-                                        if (item.getLink() == null) {
+                                        if (item.getLink() != null) {
+                                                pause(item);
+                                                item.setSelectedMode(Item.SelectedMode.Normal,
+                                                                _stepColor);
+                                        } else {
                                                 item.setBackgroundColor(_stepColor);
-                                        }else{
-                                                item.setSelectedMode(Item.SelectedMode.Normal,_stepColor);
                                         }
                                         FrameGraphics.Repaint();
@@ -392 +426 @@
                                 lastItemStatus = RunItem(item, context, lastItemStatus);
                                 if (_step) {
-                                        if (item.getLink() != null) {
-                                                item.setBackgroundColor(_stepColor);
+                                        if (item.getLink() == null) {
+                                                item.setBackgroundColor(oldColor);
+                                                pause(item);
+                                        } else {
                                                 item.setSelectedMode(Item.SelectedMode.None);
-                                                FrameGraphics.Repaint();
                                         }
-                                        int timeRemaining;
-                                        if (_stepPause < 0)
-                                                timeRemaining = Integer.MAX_VALUE;
-                                        else
-                                                timeRemaining = _stepPause;
-
-                                        while (timeRemaining > 0 && !_nextStatement) {
-                                                if (_stop) {
-                                                        item.setBackgroundColor(oldColor);
-                                                        item.setSelectedMode(SelectedMode.Normal,_stepColor);
-                                                        throw new Exception("Program terminated");
-                                                }
-                                                Thread.sleep(DefaultAgent.TIMER_RESOLUTION);
-                                                timeRemaining -= DefaultAgent.TIMER_RESOLUTION;
-                                        }
-                                        _nextStatement = false;
-                                        // Turn off the highlighting
-                                        item.setBackgroundColor(oldColor);
                                 }
 
@@ -447 +464 @@
 
         /**
+         * @param item
+         * @param oldColor
+         * @throws Exception
+         * @throws InterruptedException
+         */
+        private static void pause(Text item) throws Exception, InterruptedException {
+                if (!_step)
+                        return;
+
+                Color oldColor = item.getBackgroundColor();
+                item.setBackgroundColor(_stepColor);
+                item.setSelectedMode(Item.SelectedMode.None);
+
+                // Make sure we are on the frame with this item
+                Frame parent = item.getParentOrCurrentFrame();
+                if (!parent.equals(DisplayIO.getCurrentFrame())) {
+                        DisplayIO.setCurrentFrame(parent);
+                }
+
+                FrameGraphics.Repaint();
+
+                int timeRemaining;
+                if (_stepPause < 0)
+                        timeRemaining = Integer.MAX_VALUE;
+                else
+                        timeRemaining = _stepPause;
+
+                while (timeRemaining > 0 && !_nextStatement) {
+                        if (_stop) {
+                                item.setBackgroundColor(oldColor);
+                                item.setSelectedMode(SelectedMode.Normal, _stepColor);
+                                throw new Exception("Program terminated");
+                        }
+                        Thread.sleep(DefaultAgent.TIMER_RESOLUTION);
+                        timeRemaining -= DefaultAgent.TIMER_RESOLUTION;
+                }
+                _nextStatement = false;
+                // Turn off the highlighting
+                item.setBackgroundColor(oldColor);
+        }
+
+        private static void pause(double time) throws Exception {
+                for (int i = 0; i < time * 10; i++) {
+                        if (_stop) {
+                                throw new Exception("Program terminated");
+                        }
+                        Thread.yield();
+                        Thread.sleep(100);
+                }
+        }
+
+        /**
          * This method should be modified to parse strings correctly
          * 
@@ -453 +522 @@
          */
         private static String[] parseStatement(Text code) throws Exception {
-                String statement = code.getText();
+                String statement = code.getText().trim();
                 ArrayList<String> tokens = new ArrayList<String>();
+
+                // Check special annotation tags for programs
+                if (statement.length() > 0 && statement.charAt(0) == '@') {
+                        statement = statement.toLowerCase();
+                        // Flags the next unit test as being required to throw an exception
+                        if (statement.equals("@throwsexception")) {
+                                code.getParentOrCurrentFrame().setThrowsException(true);
+                        }
+                        return null;
+                }
 
                 for (int i = 0; i < statement.length(); i++) {
@@ -643 +722 @@
                 }
 
-                // Comments without links are a no-op
-                if (tokens.length == 0) {
+                // Annotation items are ignored after parsing running options
+                if (tokens == null) {
+                        return Status.OK;
+                        // Comments without links are ignored
+                } else if (tokens.length == 0) {
                         if (code.getLink() == null)
                                 return Status.OK;
@@ -665 +747 @@
                                                         && tokens.length == 3) {
                                                 context.getPrimitives().set(tokens[1], tokens[2]);
-                                                return Status.OK;
                                         }
                                         // Otherwise we are setting a variable with a literal
@@ -675 +756 @@
                                                                         new SString(tokens[2].substring(1,
                                                                                         tokens[2].length() - 1)));
-                                                        return Status.OK;
-
                                                         // set a literal
                                                 } else if (tokens.length == 3) {
                                                         context.getPrimitives().setValue(tokens[1],
                                                                         tokens[2]);
-                                                        return Status.OK;
                                                 }
                                         }
@@ -688 +766 @@
                                 }
                         } else if (tokens[0].equals("setassociation")) {
-                                assertMinParametreCount(tokens, 3);
+                                assertExactParametreCount(tokens, 3);
 
                                 Map map = (Map) context.getPointers().getVariable(tokens[1])
@@ -697 +775 @@
                                                 .getStringValue(tokens[3]);
                                 map.put(attribute, value);
-                                return Status.OK;
                         } else if (tokens[0].equals("setframevalue")) {
                                 assertMinParametreCount(tokens, 3);
@@ -754 +831 @@
                                         }
                                 }
-
-                                return Status.OK;
                         } else if (tokens[0].startsWith("setitem")) {
                                 if (tokens[0].equals("setitemposition")) {
@@ -838 +913 @@
                                         throw new Exception("Unsupported setItem command: "
                                                         + code.toString());
-                                return Status.OK;
                         } else if (tokens[0].equals("setstrchar")) {
                                 assertExactParametreCount(tokens, 3);
@@ -854 +928 @@
                                 context.getPrimitives().setValue(tokens[1],
                                                 new SString(s.toString()));
-                                return Status.OK;
                         } else if (tokens[0].equals("setcharinitem")) {
                                 assertExactParametreCount(tokens, 4);
@@ -883 +956 @@
                                 itemText.set(row, sb.toString());
                                 item.setTextList(itemText);
-
-                                return Status.OK;
                         }
                 } else if (tokens[0].startsWith("assert")) {
@@ -891 +962 @@
                                 if (!context.getPrimitives().getBooleanValue(tokens[1]))
                                         throw new UnitTestFailedException("true", "false");
-                                return Status.OK;
                         } else if (tokens[0].equals("assertfalse")) {
                                 assertExactParametreCount(tokens, 1);
                                 if (context.getPrimitives().getBooleanValue(tokens[1]))
                                         throw new UnitTestFailedException("false", "true");
-                                return Status.OK;
-                        }
-                        if (tokens[0].equals("assertfail")) {
+                        } else if (tokens[0].equals("assertfail")) {
                                 assertExactParametreCount(tokens, 0);
                                 throw new UnitTestFailedException("pass", "fail");
@@ -907 +975 @@
                                 if (value != null)
                                         throw new UnitTestFailedException("null", value.toString());
-                                return Status.OK;
                         } else if (tokens[0].equals("assertnotnull")) {
                                 assertExactParametreCount(tokens, 1);
@@ -914 +981 @@
                                 if (value == null)
                                         throw new UnitTestFailedException("not null", "null");
-                                return Status.OK;
                         } else if (tokens[0].equals("assertdefined")) {
                                 assertExactParametreCount(tokens, 1);
                                 if (!context.isDefined(tokens[1]))
                                         throw new UnitTestFailedException("defined", "not defined");
-                                return Status.OK;
                         } else if (tokens[0].equals("assertnotdefined")) {
                                 assertExactParametreCount(tokens, 1);
                                 if (context.isDefined(tokens[1]))
                                         throw new UnitTestFailedException("defined", "not defined");
-                                return Status.OK;
                         } else if (tokens[0].equals("assertequals")) {
                                 assertExactParametreCount(tokens, 2);
@@ -931 +995 @@
                                                         .getStringValue(tokens[1]), context.getPrimitives()
                                                         .getStringValue(tokens[2]));
-                                return Status.OK;
                         } else if (tokens[0].equals("assertdefined")) {
                                 assertExactParametreCount(tokens, 1);
@@ -938 +1001 @@
                                                         "not defined");
                                 }
-                                return Status.OK;
                         }
                 } else if (tokens[0].startsWith("goto")) {
@@ -949 +1011 @@
                                         frameNameVar);
                         NavigationActions.Goto(frameName);
-                        return Status.OK;
                 } else if (tokens[0].startsWith("get")) {
                         if (tokens[0].startsWith("getframe")) {
@@ -1011 +1072 @@
                                                 }
                                         }
-                                        return Status.OK;
                                 } else if (tokens[0].startsWith("getframename")) {
                                         String frameNameVar = DEFAULT_STRING;
@@ -1026 +1086 @@
                                         context.getPrimitives().setValue(frameNameVar,
                                                         frame.getName());
-                                        return Status.OK;
                                 } else if (tokens[0].startsWith("getframefilepath")) {
                                         assertExactParametreCount(tokens, 2);
@@ -1035 +1094 @@
                                                         frameName);
                                         context.getPrimitives().setValue(tokens[2], filePath);
-                                        return Status.OK;
                                 } else if (tokens[0].equals("getframelog")) {
                                         assertExactParametreCount(tokens, 1);
@@ -1046 +1104 @@
                                                         .getValue();
                                         t.setText(log);
-
-                                        return Status.OK;
                                 }
                         } else if (tokens[0].equals("getassociation")) {
@@ -1057 +1113 @@
                                 String newValue = map.get(attribute).toString();
                                 context.getPrimitives().setValue(tokens[3], newValue);
-                                return Status.OK;
                         } else if (tokens[0].startsWith("getcurrent")) {
                                 if (tokens[0].equals("getcurrentframe")) {
@@ -1071 +1126 @@
                                                                 new SString(currentFrame.getName()));
                                         }
-                                        return Status.OK;
                                 }
                         } else if (tokens[0].startsWith("getitem")) {
@@ -1162 +1216 @@
                                         throw new Exception("Unsupported getItem command: "
                                                         + code.toString());
-
-                                return Status.OK;
                         } else if (tokens[0].equals("getstrchar")) {
                                 assertExactParametreCount(tokens, 3);
@@ -1172 +1224 @@
                                 context.getPrimitives().setValue(tokens[3],
                                                 new SCharacter(s.charAt(pos - 1)));
-                                return Status.OK;
                         } else if (tokens[0].equals("getstrlength")) {
                                 assertExactParametreCount(tokens, 2);
@@ -1179 +1230 @@
                                 context.getPrimitives().setValue(tokens[2],
                                                 new SInteger(s.length()));
-                                return Status.OK;
                         } else if (tokens[0].equals("getelapsedtime")) {
                                 assertExactParametreCount(tokens, 1);
                                 context.getPrimitives().setValue(tokens[1],
                                                 new SInteger(AgentStats.getMilliSecondsElapsed()));
-                                return Status.OK;
                         } else if (tokens[0].equals("getlastnumberinframeset")) {
                                 String framesetNameVar = DEFAULT_STRING;
@@ -1197 +1246 @@
                                 long count = FrameIO.getLastNumber(frameset);
                                 context.getPrimitives().setValue(countVar, new SInteger(count));
-                                return Status.OK;
                         } else if (tokens[0].equals("getlistofframesets")) {
                                 String stringVar = DEFAULT_ITEM;
@@ -1206 +1254 @@
                                 context.getPrimitives().setValue(stringVar,
                                                 FrameIO.getFramesetList());
-                                return Status.OK;
                         } else if (tokens[0].equals("getsessionstats")) {
                                 assertExactParametreCount(tokens, 1);
@@ -1212 +1259 @@
 
                                 String stats = SessionStats.getCurrentStats();
-                                Text t;
-                                // try {
-                                t = (Text) context.getPointers().getVariable(tokens[1])
+                                Text t = (Text) context.getPointers().getVariable(tokens[1])
                                                 .getValue();
                                 t.setText(stats);
-                                // } catch (Exception e) {
-                                // t = new Text(-1, stats);
-                                // context.getPointers().setObject(tokens[1], t);
-                                // }
-
-                                return Status.OK;
                         } else if (tokens[0].equals("getrandominteger")) {
                                 assertExactParametreCount(tokens, 3);
@@ -1234 +1273 @@
                                 context.getPrimitives().setValue(tokens[3],
                                                 new SInteger(result));
-                                return Status.OK;
                         } else if (tokens[0].equals("getrandomreal")) {
                                 assertExactParametreCount(tokens, 3);
@@ -1245 +1283 @@
                                                 + lowerBound;
                                 context.getPrimitives().setValue(tokens[3], new SReal(result));
-                                return Status.OK;
                         } else if (tokens[0].equals("getrandomtextitem")) {
                                 assertExactParametreCount(tokens, 2);
@@ -1256 +1293 @@
                                 context.getPointers()
                                                 .setObject(tokens[2], items.get(itemIndex));
-                                return Status.OK;
                         }
                 } else if (tokens[0].equals("or")) {
@@ -1270 +1306 @@
                         context.getPrimitives().setValue(tokens[tokens.length - 1],
                                         new SBoolean(false));
-                        return Status.OK;
                 } else if (tokens[0].equals("and")) {
                         for (int i = 1; i < tokens.length - 1; i++) {
@@ -1283 +1318 @@
                         context.getPrimitives().setValue(tokens[tokens.length - 1],
                                         new SBoolean(true));
-                        return Status.OK;
                 } else if (tokens[0].equals("messagelnitem")
                                 || tokens[0].equals("messagelineitem")) {
@@ -1305 +1339 @@
                                 // Just ignore other errors
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("messageln")
                                 || tokens[0].equals("messageline")
@@ -1318 +1351 @@
                         else
                                 FrameGraphics.DisplayMessageAlways(message);
-                        return Status.OK;
                 } else if (tokens[0].equals("typeatrate")) {
                         assertMinParametreCount(tokens, 1);
@@ -1327 +1359 @@
                                 Thread.sleep((int) (delay * 1000));
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("type") || tokens[0].equals("typenospaces")) {
 
@@ -1336 +1367 @@
                                 Thread.sleep(25);
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("runstring")) {
                         String codeText = getMessage(tokens, context, code.toString(), " ",
@@ -1342 +1372 @@
                         Text dynamicCode = new Text(1, codeText);
                         RunItem(dynamicCode, context, Status.OK);
-                        return Status.OK;
                 } else if (tokens[0].equals("runoscommand")) {
                         String command = getMessage(tokens, context, code.toString(), " ",
                                         1);
                         Runtime.getRuntime().exec(command);
-                        return Status.OK;
                 } else if (tokens[0].equals("executeoscommand")) {
                         String command = getMessage(tokens, context, code.toString(), " ",
@@ -1369 +1397 @@
                                 throw new RuntimeException(e.getMessage());
                         }
-                        return Status.OK;
                 } else if (tokens[0].startsWith("else")) {
                         // if the if statement was false then run the else statement
@@ -1513 +1540 @@
                         }
                         return Status.FalseIf;
-
                 } // Look for variable length methods
                 else if (tokens[0].equals("attachitemtocursor")) {
@@ -1529 +1555 @@
                                                         FrameMouseActions.MouseY);
                         FrameMouseActions.pickup(item);
-                        return Status.OK;
                 } else if (tokens[0].equals("attachstrtocursor")) {
                         String stringVar = DEFAULT_STRING;
@@ -1544 +1569 @@
                                                         FrameMouseActions.MouseY);
                         FrameMouseActions.pickup(item);
-                        // DisplayIO.repaint();
-                        return Status.OK;
                 } else if (tokens[0].equals("additemtoframe")) {
                         String itemVar = DEFAULT_ITEM;
@@ -1562 +1585 @@
                                         .getValue();
                         frame.addItem(item);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("connectdots")) {
                         assertMinParametreCount(tokens, 2);
@@ -1584 +1605 @@
                         Frame frame = dot1.getParent();
                         frame.addItem(new Line(dot1, dot2, frame.getNextItemID()));
-                        return Status.OK;
                 } else if (tokens[0].equals("createitem")
                                 || tokens[0].equals("createtext")) {
@@ -1615 +1635 @@
                         }
                         context.getPointers().setObject(tokens[4], newItem);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("deleteitem")) {
                         assertMinParametreCount(tokens, 1);
@@ -1623 +1641 @@
                                         .getValue();
                         item.delete();
-                        return Status.OK;
                 } else if (tokens[0].equals("deleteframe")) {
                         assertMinParametreCount(tokens, 1);
@@ -1635 +1652 @@
                                                 new SBoolean(success));
                         }
-
-                        return Status.OK;
                 } else if (tokens[0].equals("deleteframeset")) {
                         assertMinParametreCount(tokens, 1);
@@ -1647 +1662 @@
                                                 new SBoolean(success));
                         }
-
-                        return Status.OK;
                 } else if (tokens[0].equals("copyitem")) {
                         assertMinParametreCount(tokens, 2);
@@ -1657 +1670 @@
                         Item copy = item.copy();
                         context.getPointers().setObject(tokens[2], copy);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("copyframeset")) {
                         assertMinParametreCount(tokens, 2);
@@ -1672 +1683 @@
                                                 new SBoolean(success));
                         }
-
-                        return Status.OK;
                 } else if (tokens[0].equals("copyframe")) {
                         assertMinParametreCount(tokens, 2);
@@ -1698 +1707 @@
                                                 new SBoolean(success));
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("createframe")) {
 
@@ -1715 +1723 @@
                         } else
                                 context.createFrame(framesetName, frameVar, null);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("closeframe")) {
                         String frameVar = DEFAULT_FRAME;
@@ -1730 +1736 @@
                         } else
                                 context.closeFrame(frameVar, null);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("readframe")
                                 || tokens[0].equals("openframe")) {
@@ -1751 +1755 @@
                         } else
                                 context.readFrame(frameName, frameVar, null);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("readkbdcond")) {
 
@@ -1772 +1774 @@
                                 context.getPrimitives().setValue(nextCharVarName,
                                                 new SCharacter(nextChar));
-
-                        return Status.OK;
                 } else if (tokens[0].equals("createassociation")) {
 
@@ -1784 +1784 @@
                         Map<String, String> newMap = new HashMap<String, String>();
                         context.getPointers().setObject(associationVar, newMap);
-                        return Status.OK;
                 } else if (tokens[0].equals("deleteassociation")) {
 
@@ -1794 +1793 @@
                         }
                         context.getPointers().delete(associationVar);
-                        return Status.OK;
                 } else if (tokens[0].equals("openreadfile")) {
                         assertVariableType(tokens[1], 1, SString.prefix);
@@ -1804 +1802 @@
                         } else
                                 context.openReadFile(tokens[1], tokens[2]);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("readlinefile")
                                 || tokens[0].equals("readlnfile")) {
@@ -1815 +1811 @@
                         } else
                                 context.readLineFile(tokens[1], tokens[2]);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("readitemfile")) {
                         assertVariableType(tokens[1], 1, SPointer.filePrefix);
@@ -1826 +1820 @@
                         } else
                                 context.readItemFile(tokens[1], tokens[2]);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("openwritefile")) {
                         assertVariableType(tokens[1], 1, SString.prefix);
@@ -1837 +1829 @@
                         } else
                                 context.openWriteFile(tokens[1], tokens[2]);
-
-                        return Status.OK;
                 } else if (tokens[0].equals("writefile")
                                 || tokens[0].equals("writelinefile")
@@ -1863 +1853 @@
                                 textToWrite.append('\n');
                         context.writeFile(tokens[1], textToWrite.toString());
-
-                        return Status.OK;
                 } else if (tokens[0].equals("displayframeset")) {
                         assertMinParametreCount(tokens, 1);
@@ -1915 +1903 @@
                                 }
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("createframeset")) {
                         String framesetName = DEFAULT_STRING;
@@ -1925 +1912 @@
                         }
                         context.createFrameset(framesetName, successVar);
-                        return Status.OK;
                 } else if (tokens[0].equals("writetree")) {
                         assertMinParametreCount(tokens, 3);
@@ -1938 +1924 @@
                                 wt.run();
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("concatstr")) {
                         assertMinParametreCount(tokens, 3);
@@ -1951 +1936 @@
                         context.getPrimitives().setValue(resultVar,
                                         new SString(sb.toString()));
-                        return Status.OK;
                 } else if (tokens[0].equals("convstrlower")) {
                         assertExactParametreCount(tokens, 1);
@@ -1959 +1943 @@
                                         new SString(context.getPrimitives().getStringValue(
                                                         tokens[1]).toLowerCase()));
-                        return Status.OK;
                 } else if (tokens[0].equals("convstrupper")) {
                         assertExactParametreCount(tokens, 1);
@@ -1967 +1950 @@
                                         new SString(context.getPrimitives().getStringValue(
                                                         tokens[1]).toUpperCase()));
-                        return Status.OK;
                 } else if (tokens[0].equals("countcharsinstr")) {
                         assertExactParametreCount(tokens, 3);
@@ -1974 +1956 @@
                         int count = countCharsInString(s, pattern);
                         context.getPrimitives().setValue(tokens[3], new SInteger(count));
-                        return Status.OK;
                 } else if (tokens[0].equals("countcharsinitem")) {
                         assertExactParametreCount(tokens, 3);
@@ -1985 +1966 @@
                                 count = countCharsInString(((Text) item).getText(), pattern);
                         context.getPrimitives().setValue(tokens[3], new SInteger(count));
-                        return Status.OK;
                 } else if (tokens[0].equals("parseframename")) {
                         assertExactParametreCount(tokens, 4);
@@ -2007 +1987 @@
                         // assertPrimitiveType(tokens[4], 4);
                         context.getPrimitives().setValue(tokens[4], new SInteger(frameNo));
-
-                        return Status.OK;
                 } else if (tokens[0].equals("parsestr")) {
                         assertMinParametreCount(tokens, 2);
@@ -2056 +2034 @@
                                 }
                         }
-                        return Status.OK;
                 } else if (tokens[0].equals("stripstr")) {
                         assertExactParametreCount(tokens, 2);
@@ -2065 +2042 @@
                                 s = s.replaceAll(charsToStrip.substring(i, i + 1), "");
                         context.getPrimitives().setValue(tokens[1], new SString(s));
-                        return Status.OK;
                 } else if (tokens[0].equals("subststr")) {
                         assertExactParametreCount(tokens, 3);
@@ -2075 +2051 @@
                         result = result.replaceAll(oldString, newString);
                         context.getPrimitives().setValue(tokens[1], new SString(result));
-                        return Status.OK;
                 } else if (tokens[0].equals("substr")) {
                         assertExactParametreCount(tokens, 4);
@@ -2089 +2064 @@
                                 result = s.substring(startPos);
                         context.getPrimitives().setValue(tokens[4], new SString(result));
-                        return Status.OK;
                 } else if (tokens[0].equals("pause")) {
                         String lengthVar = DEFAULT_REAL;
@@ -2099 +2073 @@
 
                         pause(context.getPrimitives().getDoubleValue(lengthVar));
-                        return Status.OK;
                 } else if (tokens[0].equals("glidecursorto")) {
                         assertMinParametreCount(tokens, 2);
@@ -2131 +2104 @@
                         Thread.sleep(milliseconds % timeInterval);
                         DisplayIO.setCursorPosition(finalX, finalY);
-                        return Status.OK;
                 } else if (tokens[0].equals("glideitemto")) {
                         assertMinParametreCount(tokens, 3);
@@ -2179 +2151 @@
                         FrameGraphics.Repaint();
                         // FrameMouseActions.updateCursor();
-                        return Status.OK;
                 }
                 // Now look for fixed parametre statements
-                else if (tokens.length == 1) {
-                        if (tokens[0].equals(EXIT_TEXT)) {
-                                return Status.Exit;
-                        } else if (tokens[0].equals(LOOP_TEXT)) {
-                                Status status = Status.OK;
-                                // Keep looping until break or exit occurs
-                                while (status == Status.OK || status == Status.Continue)
-                                        status = RunFrameAndReportError(code, context);
-                                if (status == Status.Continue || status == Status.Break)
-                                        status = Status.OK;
-                                return status;
-                        } else if (tokens[0].equals(CONTINUE_TEXT)
-                                        || tokens[0].equals(CONTINUE2_TEXT)) {
-                                return Status.Continue;
-                        } else if (tokens[0].equals(BREAK_TEXT)
-                                        || tokens[0].equals(BREAK2_TEXT)) {
-                                return Status.Break;
-                        } else if (tokens[0].equals(RETURN_TEXT)) {
-                                return Status.Return;
-                        } else if (tokens[0].equals("pressleftbutton")) {
-                                DisplayIO.pressMouse(InputEvent.BUTTON1_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("pressmiddlebutton")) {
-                                DisplayIO.pressMouse(InputEvent.BUTTON2_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("pressrightbutton")) {
-                                DisplayIO.pressMouse(InputEvent.BUTTON3_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("releaseleftbutton")) {
-                                DisplayIO.releaseMouse(InputEvent.BUTTON1_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("releasemiddlebutton")) {
-                                DisplayIO.releaseMouse(InputEvent.BUTTON2_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("releaserightbutton")) {
-                                DisplayIO.releaseMouse(InputEvent.BUTTON3_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("clickleftbutton")) {
-                                DisplayIO.clickMouse(InputEvent.BUTTON1_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("clickmiddlebutton")) {
-                                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("clickrightbutton")) {
-                                DisplayIO.clickMouse(InputEvent.BUTTON3_MASK);
-                                return Status.OK;
-                        } else if (tokens[0].equals("repaint")) {
-                                FrameGraphics.Repaint();
-                                return Status.OK;
-                        }
-
-                        if (tokens[0].equals("add")) {
+                else if (tokens[0].equals(EXIT_TEXT)) {
+                        return Status.Exit;
+                } else if (tokens[0].equals(LOOP_TEXT)) {
+                        Status status = Status.OK;
+                        // Keep looping until break or exit occurs
+                        while (status == Status.OK || status == Status.Continue) {
+                                status = RunFrameAndReportError(code, context);
+                                pause(code);
+                        }
+                        if (status == Status.Continue || status == Status.Break)
+                                status = Status.OK;
+                        return status;
+                } else if (tokens[0].equals(CONTINUE_TEXT)
+                                || tokens[0].equals(CONTINUE2_TEXT)) {
+                        return Status.Continue;
+                } else if (tokens[0].equals(BREAK_TEXT)
+                                || tokens[0].equals(BREAK2_TEXT)) {
+                        return Status.Break;
+                } else if (tokens[0].equals(RETURN_TEXT)) {
+                        return Status.Return;
+                } else if (tokens[0].equals("pressleftbutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.pressMouse(InputEvent.BUTTON1_MASK);
+                } else if (tokens[0].equals("pressmiddlebutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.pressMouse(InputEvent.BUTTON2_MASK);
+                } else if (tokens[0].equals("pressrightbutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.pressMouse(InputEvent.BUTTON3_MASK);
+                } else if (tokens[0].equals("releaseleftbutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.releaseMouse(InputEvent.BUTTON1_MASK);
+                } else if (tokens[0].equals("releasemiddlebutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.releaseMouse(InputEvent.BUTTON2_MASK);
+                } else if (tokens[0].equals("releaserightbutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.releaseMouse(InputEvent.BUTTON3_MASK);
+                } else if (tokens[0].equals("clickleftbutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.clickMouse(InputEvent.BUTTON1_MASK);
+                } else if (tokens[0].equals("clickmiddlebutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
+                } else if (tokens[0].equals("clickrightbutton")) {
+                        assertExactParametreCount(tokens, 0);
+                        DisplayIO.clickMouse(InputEvent.BUTTON3_MASK);
+                } else if (tokens[0].equals("repaint")) {
+                        assertExactParametreCount(tokens, 0);
+                        FrameGraphics.Repaint();
+                } else if (tokens[0].equals("add")) {
+                        assertMaxParametreCount(tokens, 3);
+                        switch (tokens.length) {
+                        case 1:
                                 context.getPrimitives().add(DEFAULT_INTEGER);
-                        } else if (tokens[0].equals("subtract")) {
+                                break;
+                        case 2:
+                                context.getPrimitives().add(tokens[1]);
+                                break;
+                        case 3:
+                                context.getPrimitives().add(tokens[2], tokens[1]);
+                                break;
+                        case 4:
+                                context.getPrimitives().add(tokens[1], tokens[2], tokens[3]);
+                                break;
+                        default:
+                                assert (false);
+                        }
+                } else if (tokens[0].equals("subtract")) {
+                        assertMaxParametreCount(tokens, 3);
+                        switch (tokens.length) {
+                        case 1:
                                 context.getPrimitives().subtract(DEFAULT_INTEGER);
-                        } else
-                                throw new RuntimeException("Invalid statement:");
-                        return Status.OK;
-                } else if (tokens.length == 2) {
-                        if (tokens[0].equals("closewritefile")) {
-                                assertVariableType(tokens[1], 1, SPointer.filePrefix);
-                                context.closeWriteFile(tokens[1]);
-
-                                return Status.OK;
-                        } else if (tokens[0].equals("closereadfile")) {
-                                assertVariableType(tokens[1], 1, SPointer.filePrefix);
-                                context.closeReadFile(tokens[1]);
-
-                                return Status.OK;
-                        }
-
-                        if (Primitives.isPrimitive(tokens[1])) {
-                                if (tokens[0].equals("add")) {
-                                        context.getPrimitives().add(tokens[1]);
-                                } else if (tokens[0].equals("subtract")) {
-                                        context.getPrimitives().subtract(tokens[1]);
-                                } else
-                                        throw new RuntimeException("Invalid statement:");
-                                return Status.OK;
-                        }
-                } else if (tokens.length == 3) {
-                        if (tokens[0].startsWith("foreach")) {
-                                Class itemType = Object.class;
-                                String type = tokens[0].substring("foreach".length());
-                                // Check the type of foreach loop
-                                // and set the item type to iterate over
-                                if (type.equals("dot")) {
-                                        itemType = Dot.class;
-                                } else if (type.equals("text")) {
-                                        itemType = Text.class;
-                                } else if (type.equals("line")) {
-                                        itemType = Line.class;
-                                }
-
-                                assertVariableType(tokens[2], 2, SPointer.itemPrefix);
-                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
-                                Frame currFrame = (Frame) context.getPointers().getVariable(
-                                                tokens[1]).getValue();
-                                // Create the ip variable
-                                Item frameTitle = currFrame.getTitleItem();
-
-                                for (Item i : currFrame.getItems()) {
-                                        if (i == frameTitle)
-                                                continue;
-                                        if (!(itemType.isInstance(i)))
-                                                continue;
-
-                                        context.getPointers().setObject(tokens[2], i);
-                                        Status status = RunFrameAndReportError(code, context);
-                                        // check if we need to exit this loop because of
-                                        // statements in the code that was run
-                                        if (status == Status.Exit || status == Status.Return)
-                                                return status;
-                                        else if (status == Status.Break)
-                                                return Status.OK;
-                                }
-                                return Status.OK;
-                        }
-
-                        if (Primitives.isPrimitive(tokens[1])
-                                        && Primitives.isPrimitive(tokens[2])) {
-                                if (tokens[0].equals("movecursorto")) {
-                                        assertExactParametreCount(tokens, 2);
-                                        int x = (int) context.getPrimitives().getIntegerValue(
-                                                        tokens[1]);
-                                        int y = (int) context.getPrimitives().getIntegerValue(
-                                                        tokens[2]);
-                                        DisplayIO.setCursorPosition(x, y);
-                                        return Status.OK;
-                                } else if (tokens[0].equals("not")) {
-                                        context.getPrimitives().not(tokens[1], tokens[2]);
-                                } else if (tokens[0].equals("exp")) {
-                                        context.getPrimitives().exp(tokens[1], tokens[2]);
-                                } else if (tokens[0].equals("log")) {
-                                        context.getPrimitives().log(tokens[2], tokens[2]);
-                                } else if (tokens[0].equals("log10")) {
-                                        context.getPrimitives().log10(tokens[1], tokens[2]);
-                                } else if (tokens[0].equals("sqrt")) {
-                                        context.getPrimitives().sqrt(tokens[1], tokens[2]);
-                                } else if (tokens[0].equals("add")) {
-                                        context.getPrimitives().add(tokens[2], tokens[1]);
-                                } else if (tokens[0].equals("subtract")) {
-                                        context.getPrimitives().subtract(tokens[2], tokens[1]);
-                                } else if (tokens[0].equals("multiply")) {
-                                        context.getPrimitives().multiply(tokens[2], tokens[1]);
-                                } else if (tokens[0].equals("divide")) {
-                                        context.getPrimitives().divide(tokens[2], tokens[1]);
-                                } else
-                                        throw new RuntimeException("Invalid statement:");
-                                return Status.OK;
-                        }
-                } else if (tokens.length == 4) {
+                                break;
+                        case 2:
+                                context.getPrimitives().subtract(tokens[1]);
+                                break;
+                        case 3:
+                                context.getPrimitives().subtract(tokens[2], tokens[1]);
+                                break;
+                        case 4:
+                                context.getPrimitives().subtract(tokens[1], tokens[2],
+                                                tokens[3]);
+                                break;
+                        default:
+                                assert (false);
+                        }
+                } else if (tokens[0].equals("multiply")) {
+                        assertMinParametreCount(tokens, 2);
+                        assertMaxParametreCount(tokens, 3);
+                        switch (tokens.length) {
+                        case 3:
+                                context.getPrimitives().multiply(tokens[2], tokens[1]);
+                                break;
+                        case 4:
+                                context.getPrimitives().multiply(tokens[1], tokens[2],
+                                                tokens[3]);
+                                break;
+                        default:
+                                assert (false);
+                        }
+                } else if (tokens[0].equals("divide")) {
+                        assertMinParametreCount(tokens, 2);
+                        assertMaxParametreCount(tokens, 3);
+                        switch (tokens.length) {
+                        case 3:
+                                context.getPrimitives().divide(tokens[2], tokens[1]);
+                                break;
+                        case 4:
+                                context.getPrimitives().divide(tokens[1], tokens[2], tokens[3]);
+                                break;
+                        default:
+                                assert (false);
+                        }
+                } else if (tokens[0].equals("modulo")) {
+                        assertExactParametreCount(tokens, 3);
+                        context.getPrimitives().modulo(tokens[1], tokens[2], tokens[3]);
+                } else if (tokens[0].equals("power")) {
+                        assertExactParametreCount(tokens, 3);
+                        context.getPrimitives().power(tokens[1], tokens[2], tokens[3]);
+                } else if (tokens[0].equals("not")) {
+                        assertExactParametreCount(tokens, 2);
+                        context.getPrimitives().not(tokens[1], tokens[2]);
+                } else if (tokens[0].equals("exp")) {
+                        assertExactParametreCount(tokens, 2);
+                        context.getPrimitives().exp(tokens[1], tokens[2]);
+                } else if (tokens[0].equals("log")) {
+                        assertExactParametreCount(tokens, 2);
+                        context.getPrimitives().log(tokens[2], tokens[2]);
+                } else if (tokens[0].equals("log10")) {
+                        assertExactParametreCount(tokens, 2);
+                        context.getPrimitives().log10(tokens[1], tokens[2]);
+                } else if (tokens[0].equals("sqrt")) {
+                        assertExactParametreCount(tokens, 2);
+                        context.getPrimitives().sqrt(tokens[1], tokens[2]);
+                } else if (tokens[0].equals("closewritefile")) {
+                        assertVariableType(tokens[1], 1, SPointer.filePrefix);
+                        context.closeWriteFile(tokens[1]);
+                } else if (tokens[0].equals("closereadfile")) {
+                        assertVariableType(tokens[1], 1, SPointer.filePrefix);
+                        context.closeReadFile(tokens[1]);
+                } else if (tokens[0].startsWith("foreach")) {
                         if (tokens[0].equals("foreachassociation")) {
                                 assertExactParametreCount(tokens, 3);
@@ -2345 +2306 @@
                                         context.getPrimitives().setValue(tokens[3], value);
                                         Status status = RunFrameAndReportError(code, context);
+                                        pause(code);
+                                        // check if we need to exit this loop because of
+                                        // statements in the code that was run
+                                        if (status == Status.Exit || status == Status.Return)
+                                                return status;
+                                        else if (status == Status.Break)
+                                                break;
+                                }
+                        } else {
+                                Class itemType = Object.class;
+                                String type = tokens[0].substring("foreach".length());
+                                // Check the type of foreach loop
+                                // and set the item type to iterate over
+                                if (type.equals("dot")) {
+                                        itemType = Dot.class;
+                                } else if (type.equals("text")) {
+                                        itemType = Text.class;
+                                } else if (type.equals("line")) {
+                                        itemType = Line.class;
+                                } else if (type.equals("item") || type.equals("")) {
+                                        itemType = Object.class;
+                                } else {
+                                        throw new RuntimeException("Invalid ForEach loop type");
+                                }
+
+                                assertVariableType(tokens[2], 2, SPointer.itemPrefix);
+                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                Frame currFrame = (Frame) context.getPointers().getVariable(
+                                                tokens[1]).getValue();
+                                // Create the ip variable
+                                Item frameTitle = currFrame.getTitleItem();
+
+                                for (Item i : currFrame.getItems()) {
+                                        if (i == frameTitle)
+                                                continue;
+                                        if (!(itemType.isInstance(i)))
+                                                continue;
+
+                                        context.getPointers().setObject(tokens[2], i);
+                                        Status status = RunFrameAndReportError(code, context);
+                                        pause(code);
                                         // check if we need to exit this loop because of
                                         // statements in the code that was run
@@ -2352 +2354 @@
                                                 return Status.OK;
                                 }
-                                return Status.OK;
-                        }
-
-                        if (Primitives.isPrimitive(tokens[1])
-                                        && Primitives.isPrimitive(tokens[2])
-                                        && Primitives.isPrimitive(tokens[3])) {
-                                if (tokens[0].equals("add")) {
-                                        context.getPrimitives()
-                                                        .add(tokens[1], tokens[2], tokens[3]);
-                                } else if (tokens[0].equals("subtract")) {
-                                        context.getPrimitives().subtract(tokens[1], tokens[2],
-                                                        tokens[3]);
-                                } else if (tokens[0].equals("divide")) {
-                                        context.getPrimitives().divide(tokens[1], tokens[2],
-                                                        tokens[3]);
-                                } else if (tokens[0].equals("multiply")) {
-                                        context.getPrimitives().multiply(tokens[1], tokens[2],
-                                                        tokens[3]);
-                                } else if (tokens[0].equals("modulo")) {
-                                        context.getPrimitives().modulo(tokens[1], tokens[2],
-                                                        tokens[3]);
-                                } else if (tokens[0].equals("power")) {
-                                        context.getPrimitives().power(tokens[1], tokens[2],
-                                                        tokens[3]);
-                                } else
-                                        throw new Exception("Statement not found: " + tokens[0]
-                                                        + " in " + code.toString());
-                                return Status.OK;
-                        }
+                        }
+                } else if (tokens[0].equals("movecursorto")) {
+                        assertExactParametreCount(tokens, 2);
+                        int x = (int) context.getPrimitives().getIntegerValue(tokens[1]);
+                        int y = (int) context.getPrimitives().getIntegerValue(tokens[2]);
+                        DisplayIO.setCursorPosition(x, y);
+                } else {
+                        throw new RuntimeException("Unknown statement");
                 }
-                throw new RuntimeException("Unknown statement: ");
-        }
-
-        private static void pause(double time) throws Exception {
-                for (int i = 0; i < time * 10; i++) {
-                        Thread.yield();
-                        Thread.sleep(100);
-                }
+                return Status.OK;
         }
 
@@ -2426 +2400 @@
                 if (tokens.length - 1 != parametreCount)
                         throw new IncorrectParametreCountException(parametreCount);
+        }
+
+        public static void assertMaxParametreCount(String[] tokens,
+                        int parametreCount) throws Exception {
+                if (tokens.length - 1 > parametreCount)
+                        throw new AboveMaxParametreCountException(parametreCount);
         }
 
@@ -2456 +2436 @@
                 _nextStatement = true;
         }
+
+        public static void ProgramStarted() {
+                _programsRunning++;
+                AgentStats.reset();
+                FrameGraphics.DisplayMessage("Running SimpleProgram...", Color.BLUE);
+        }
 }

trunk/src/org/expeditee/gui/Frame.java

@@ -46 +46 @@
         private String _frameset = null;
 
+        private boolean _throwsException = false;
+        
         private int _number = -1;
 
@@ -344 +346 @@
                 for (Item i : items) {
                         if (i instanceof Text && i.getX() < UserSettings.TitlePosition
-                                        && i.getY() < UserSettings.TitlePosition && i.getY() > 0)
+                                        && i.getY() < UserSettings.TitlePosition /*&& i.getY() > 0*/)
                                 return (Text) i;
                 }
@@ -1658 +1660 @@
                 return 1 + (backup == null ? 0 : backup.getCometLength());
         }
+
+        public void setThrowsException(boolean b) {
+                _throwsException = b;
+        }
+        
+        public boolean getThrowsException() {
+                return _throwsException;
+        }
 }

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -15 +15 @@
 
 import org.expeditee.actions.Actions;
+import org.expeditee.actions.Misc;
 import org.expeditee.actions.NavigationActions;
 import org.expeditee.actions.Simple;
@@ -34 +35 @@
                                         || (e.isControlDown() && e.getKeyChar() == KeyEvent.VK_C)) {
                                 Simple.stop();
-                        }else if (e.isControlDown() && e.getKeyChar() == KeyEvent.VK_SPACE){
+                        } else if (e.isControlDown() && e.getKeyChar() == KeyEvent.VK_SPACE) {
                                 Simple.nextStatement();
                         }
-                        
+
                         Simple.KeyStroke(e.getKeyChar());
-                        
+
                         if (Simple.consumeKeyboardInput())
                                 return;
@@ -67 +68 @@
 
                 if (e.isAltDown()) {
-                        if (FrameUtils.getCurrentItem() == null
-                                        && !Frame.itemAttachedToCursor()) {
-                                Item t = DisplayIO.getCurrentFrame().createNewText(ch + ": ");
-                                FrameMouseActions.pickup(t);
-                                FrameGraphics.Repaint();
-                        } else {
-                                // remove the link for alt+l
-                                if (ch == 'l') {
-                                        Item current = FrameUtils.getCurrentItem();
-                                        // If its not linked then link it to its self
-                                        if (current instanceof Text && current.getLink() == null) {
-                                                String text = ((Text) current).getText();
-                                                if (FrameIO.isValidFrameName(text)) {
-                                                        current.setLink(text);
-                                                } else if (FrameIO.isValidFramesetName(text)) {
-                                                        current.setLink(text + '1');
-                                                }
-                                        } else {
-                                                // If its linked remove the link
-                                                current.setLink(null);
-                                        }
-                                        FrameGraphics.Repaint();
-                                } else if (ch == 'a') {
-                                        Item current = FrameUtils.getCurrentItem();
-                                        // If its not linked then link it to its self
-                                        if (current instanceof Text && current.getAction() == null) {
-                                                String text = ((Text) current).getText().trim();
-                                                if (text.startsWith("a:")) {
-                                                        text = text.substring(2).trim();
-                                                } else if (text.startsWith("@")) {
-                                                        text = text.substring(1).trim();
-                                                }
-                                                current.setAction(text);
-                                        } else {
-                                                // If its linked remove the link
-                                                current.setActions(null);
-                                        }
-                                        FrameGraphics.Repaint();
-                                }
-                        }
+
                 } else {
                         processChar(ch, e.isShiftDown());
@@ -311 +273 @@
 
         private void navigateFrame(int direction) {
-                DisplayIO.setCursor(Item.DEFAULT_CURSOR);
                 switch (direction) {
                 case Text.RIGHT:
@@ -348 +309 @@
                                 Actions.interruptAgent();
                         return;
-                } else if (Simple.isProgramRunning()) {
+                } else if (Simple.consumeKeyboardInput()) {
                         return;
                 }
@@ -517 +478 @@
                 if (ch.length() > 1)
                         return;
-
-                // if this is a paste command
-                if (ch.charAt(0) == KeyEvent.VK_V) {
+                Logger.Log(Logger.USER, Logger.CONTROL_CHAR, "User pressing: Ctrl+"
+                                + ch);
+                //
+                // if (FrameUtils.getCurrentItem() == null
+                // && !Frame.itemAttachedToCursor()) {
+                // Item t = DisplayIO.getCurrentFrame().createNewText(ch + ": ");
+                // FrameMouseActions.pickup(t);
+                // } else {
+                // remove the link for alt+l
+                Item current = FrameUtils.getCurrentItem();
+                Frame currentFrame = DisplayIO.getCurrentFrame();
+                //Link or delink an item
+                if (ch.charAt(0) ==  KeyEvent.VK_L) {
+                        // If its not linked then link it to its self
+                        if (current instanceof Text && current.getLink() == null) {
+                                String text = ((Text) current).getText();
+                                if (FrameIO.isValidFrameName(text)) {
+                                        current.setLink(text);
+                                } else if (FrameIO.isValidFramesetName(text)) {
+                                        current.setLink(text + '1');
+                                }
+                        } else {
+                                // If its linked remove the link
+                                current.setLink(null);
+                        }
+                } else if (ch.charAt(0) ==  KeyEvent.VK_G) {
+                        // If its not linked then link it to its self
+                        if (current instanceof Text) {
+                                String text = ((Text) current).getText();
+                                if (FrameIO.isValidFrameName(text)) {
+                                        current.setLink(text);
+                                } else if (FrameIO.isValidFramesetName(text)) {
+                                        current.setLink(text + '1');
+                                }
+                        }
+                        if (current.getLink() != null){
+                                NavigationActions.Goto(current.getAbsoluteLink());
+                                return;
+                        }
+                } else if (ch.charAt(0) ==  KeyEvent.VK_A) {
+                        // If its not linked then link it to its self
+                        if (current instanceof Text && current.getAction() == null) {
+                                String text = ((Text) current).getText().trim();
+                                if (text.startsWith("a:")) {
+                                        text = text.substring(2).trim();
+                                } else if (text.startsWith("@")) {
+                                        text = text.substring(1).trim();
+                                }
+                                current.setAction(text);
+                        } else {
+                                // If its linked remove the link
+                                current.setActions(null);
+                        }
+                } else if (ch.charAt(0) == KeyEvent.VK_V) {
                         try {
                                 // read in the data from the clipboard
@@ -568 +580 @@
                                         addTextItemToCurrentFrame(temp, y);
                                 }
-
-                                FrameGraphics.Repaint();
                         } catch (Exception ex) {
                         }
-                        return;
-
                         // if this is a copy command
                 } else if (ch.charAt(0) == KeyEvent.VK_C) {
@@ -603 +611 @@
                         Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
                                         selection, null);
-
                         FrameGraphics.DisplayMessage("Item copied to clipboard");
                         return;
@@ -609 +616 @@
                         // perform a delete operation
                         processChar((char) KeyEvent.VK_DELETE, e.isShiftDown());
-                        FrameGraphics.Repaint();
+                        FrameMouseActions.delete(current);
+                }else if (ch.charAt(0) == KeyEvent.VK_F) {
+                        // perform a delete operation
+                        Actions.PerformAction(currentFrame, null, "Format");
+                        return;
                 } else if (ch.charAt(0) == KeyEvent.VK_J) {
 
@@ -621 +632 @@
 
                         text.setJustification(Item.JUSTIFICATION_LEFT);
-
-                        FrameGraphics.Repaint();
-                        return;
                 } else if (ch.charAt(0) == KeyEvent.VK_S) {
                         // split the current text item
@@ -641 +649 @@
                                 y += newText.getBoundsHeight();
                                 newText.setY(y);
-
-                                Frame current = DisplayIO.getCurrentFrame();
                                 // update the items ID to prevent conflicts with the current
                                 // frame
-                                newText.setID(current.getNextItemID());
-
-                                current.addItem(newText);
-                        }
+                                newText.setID(currentFrame.getNextItemID());
+                                currentFrame.addItem(newText);
+                        }
+                }
                         FrameGraphics.Repaint();
-
-                        return;
-                }
-
-                Logger.Log(Logger.USER, Logger.CONTROL_CHAR, "User pressing: Ctrl+"
-                                + ch);
         }
 

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -1676 +1676 @@
         }
 
-        private static void delete(Item toDelete) {
+        public static void delete(Item toDelete) {
                 FrameUtils.LastEdited = null;
                 _offX = _offY = 0;
@@ -2011 +2011 @@
                                         }
                                 } else {
-                                        if (mergee instanceof Dot || mergee instanceof Text) {
+                                        if (mergee.isLineEnd()) {
                                                 DisplayIO.setCursorPosition(mergee.getPosition());
                                         }

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -383 +383 @@
                 Parse(toDisplay);
                 DisplayIO.setCurrentFrame(toDisplay);
-
+                FrameMouseActions.updateCursor();
                 // update response timer
                 _LastResponse = ResponseTimer.getElapsedSeconds();

trunk/src/org/expeditee/items/Item.java

@@ -1011 +1011 @@
         public void run() {
                 try {
-                        AgentStats.reset();
-                        FrameGraphics
-                                        .DisplayMessage("Running SimpleProgram...", Color.BLUE);
+                        Simple.ProgramStarted();
                         Simple.RunFrameAndReportError(this, new Context());
                         Simple.ProgramFinished();

trunk/src/org/expeditee/items/Text.java

@@ -1511 +1511 @@
 
                 if (merger.isLineEnd()) {
+                        //Merging line ends onto non line end text is a no-op
+                        if(!isLineEnd())
+                                return null;
+                        
                         if (merger instanceof Text)
                                 insertText(((Text) merger).getText(), mouseX, mouseY);

trunk/src/org/expeditee/simple/Primitives.java

@@ -49 +49 @@
          *             if the variable name is invalid
          */
-        public void add(String name, SPrimitive value) throws IncorrectTypeException {
+        public void add(String name, SPrimitive value)
+                        throws IncorrectTypeException {
                 // figure out the type and add it...
                 SPrimitive newVar;
@@ -159 +160 @@
         /**
          * Increments a variable.
-         * @param var the name of the variable to increment
+         * 
+         * @param var
+         *            the name of the variable to increment
          * @throws Exception
          */
@@ -168 +171 @@
         /**
          * Decrements a variable.
-         * @param var the name of the variable to decrement
+         * 
+         * @param var
+         *            the name of the variable to decrement
          * @throws Exception
          */

trunk/tests/org/expeditee/actions/SimpleTest.java

@@ -76 +76 @@
                 try {
                         runSimpleTest("SimpleTest10");
-                        assertTrue(context.getPrimitives().getIntegerValue("$i.1") == 24);
-                        assertTrue(context.getPrimitives().getIntegerValue("$i.2") == 42);
+                        assertEquals(24,context.getPrimitives().getIntegerValue("$i.1"));
+                        assertEquals(42,context.getPrimitives().getIntegerValue("$i.2"));
 
                         runSimpleTest("SimpleTest11");
@@ -120 +120 @@
                 try {
                         runSimpleTest("SimpleTest23");
-                        assertEquals(context.getPrimitives().getIntegerValue("$i.Result"),
-                                        243);
-                        assertEquals(
-                                        context.getPrimitives().getIntegerValue("$i.Exponent"), 0);
+                        assertEquals(243,context.getPrimitives().getIntegerValue("$i.Result"));
+                        assertEquals(0,context.getPrimitives().getIntegerValue("$i.Exponent"));
 
                         runSimpleTest("SimpleTest30");
-                        assertEquals(context.getPrimitives().getIntegerValue("$i.Result"),
-                                        243);
-                        assertEquals(
-                                        context.getPrimitives().getIntegerValue("$i.Exponent"), 0);
+                        assertEquals(243,context.getPrimitives().getIntegerValue("$i.Result"));
+                        assertEquals(0,context.getPrimitives().getIntegerValue("$i.Exponent"));
                 } catch (Exception e) {
                         System.out.println("EVALUATION ERROR: " + e.getMessage());
@@ -193 +189 @@
         public void testSimpleTestSuite() {
                 try {
-                        Simple.RunSimpleTests("SimpleTestSuite");
+                        Simple.RunSimpleTests("SimpleTestSuite",true,false);
                 } catch (Exception e) {
                         System.out.println("EVALUATION ERROR: " + e.getMessage());