Changeset 161 for trunk/src/org/expeditee/actions/Simple.java

Timestamp:

07/25/08 16:37:58 (16 years ago)

Author:

ra33

Message:

Adding calculation stuff...

File:

• trunk/src/org/expeditee/actions/Simple.java (modified) (9 diffs)

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

@@ -44 +44 @@
 import org.expeditee.simple.BelowMinParametreCountException;
 import org.expeditee.simple.Context;
+import org.expeditee.simple.ExpediteeJEP;
 import org.expeditee.simple.IncorrectParametreCountException;
 import org.expeditee.simple.IncorrectTypeException;
@@ -59 +60 @@
 import org.expeditee.stats.AgentStats;
 import org.expeditee.stats.SessionStats;
+import org.nfunk.jep.Node;
 
 public class Simple implements Runnable {
@@ -313 +315 @@
                         t.start();
                 } else {
-                        if (!testSuite.runSuite()){
+                        if (!testSuite.runSuite()) {
                                 throw new RuntimeException(frameset + " failed");
                         }
@@ -780 +782 @@
                         // Check if the user wants to display a message
                         // Check for set statements
-                } else if (tokens[0].startsWith("issearchpatternvalid")) {
+                } else if (tokens[0].startsWith("calculatestring")) {
+                        assertMinParametreCount(tokens, 2);
+                        String toCalculate = context.getPrimitives().getStringValue(tokens[1]);
+                        boolean result = true;
+                        ExpediteeJEP myParser = new ExpediteeJEP();
+                        //Add the variables in the system
+                        context.getPrimitives().addToParser(myParser);
+                        Node equation = myParser.parseExpression(toCalculate);
+                        //TODO get the answer
+                        
+                } else if (tokens[0].startsWith("calculateitem")) {
+                        assertMinParametreCount(tokens, 1);
+                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                        Item item = (Item)context.getPointers().getVariable(tokens[1]).getValue();
+                        Frame frame = null;
+                        if(tokens.length > 2){
+                                assertVariableType(tokens[2], 2, SPointer.framePrefix);
+                                frame = (Frame)context.getPointers().getVariable(tokens[2]).getValue();
+                        }
+                        Misc.calculate(frame, item);
+                }else if (tokens[0].startsWith("issearchpatternvalid")) {
                         assertExactParametreCount(tokens, 2);
                         boolean result = true;
@@ -901 +923 @@
                                 SearchAgent searchAgent = new SearchTree();
                                 _agent = searchAgent;
-                                searchAgent.initialise(null, null, topFrameName, resultsFrameset,
-                                                replacementString, pattern);
+                                searchAgent.initialise(null, null, topFrameName,
+                                                resultsFrameset, replacementString, pattern);
                                 searchAgent.run();
                                 _agent = null;
@@ -964 +986 @@
                                 Item valueItem = null;
                                 // Begin the search
-                                for (Text text : targetFrame.getTextItems()){
+                                for (Text text : targetFrame.getTextItems()) {
                                         String s = text.getText().toLowerCase();
 
@@ -1271 +1293 @@
                                         context.getPointers().setObject(frameTitleVar,
                                                         frame.getTitleItem());
-                                }else if (tokens[0].startsWith("getframefilepath")) {
+                                } else if (tokens[0].startsWith("getframefilepath")) {
                                         assertExactParametreCount(tokens, 2);
                                         String frameName = context.getPrimitives().getStringValue(
@@ -1999 +2021 @@
                         } else
                                 context.readFrame(frameName, frameVar, null);
-                }else if (tokens[0].equals("exitexpeditee")) {
+                } else if (tokens[0].equals("exitexpeditee")) {
                         Browser._theBrowser.exit();
-                }else if (tokens[0].equals("readkbdcond")) {
+                } else if (tokens[0].equals("readkbdcond")) {
 
                         String nextCharVarName = DEFAULT_CHAR;
@@ -2483 +2505 @@
                         assertExactParametreCount(tokens, 0);
                         FrameMouseActions.leftButton();
-                        //DisplayIO.clickMouse(InputEvent.BUTTON1_MASK);
+                        // DisplayIO.clickMouse(InputEvent.BUTTON1_MASK);
                 } else if (tokens[0].equals("clickmiddlebutton")) {
                         assertExactParametreCount(tokens, 0);
                         FrameMouseActions.middleButton();
-                        //DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
+                        // DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
                 } else if (tokens[0].equals("clickrightbutton")) {
                         assertExactParametreCount(tokens, 0);
                         FrameMouseActions.rightButton();
-                        //DisplayIO.clickMouse(InputEvent.BUTTON3_MASK);
+                        // DisplayIO.clickMouse(InputEvent.BUTTON3_MASK);
                 } else if (tokens[0].equals("repaint")) {
                         assertExactParametreCount(tokens, 0);