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

Timestamp:

07/02/08 17:26:51 (16 years ago)

Author:

ra33

Message:

Added SearchItem and SearchStr

File:

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

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

@@ -323 +323 @@
                         // an item without a link signals to run the current frame
                         if (current.getLink() == null) {
-                                //Make a copy but hide it
+                                // Make a copy but hide it
                                 current = current.copy();
                                 current.setLink(DisplayIO.getCurrentFrame().getName());
@@ -352 +352 @@
          */
         public static void DebugFrame(Text current, float pause, Color color) {
-                if(isProgramRunning()){
+                if (isProgramRunning()) {
                         stop();
                 }
@@ -412 +412 @@
                         context.getPointers().setObject(SPointer.framePrefix + varName,
                                         frame);
+                        context.getPointers().setObject(SPointer.itemPrefix + varName,
+                                        frame.getTitleItem());
                         context.getPrimitives().add(SString.prefix + varName,
                                         new SString(frame.getName()));
@@ -481 +483 @@
                 if (_step) {
                         DisplayIO.removeFromBack();
-                        if(DisplayIO.getCurrentFrame() != current.getParent())
+                        if (DisplayIO.getCurrentFrame() != current.getParent())
                                 DisplayIO.setCurrentFrame(current.getParent());
                 }
@@ -766 +768 @@
                         // Check if the user wants to display a message
                         // Check for set statements
+                } else if (tokens[0].startsWith("search")) {
+                        if (tokens[0].equals("searchstr")) {
+                                assertExactParametreCount(tokens, 5);
+                                String searchStr = context.getPrimitives().getStringValue(
+                                                tokens[1]);
+                                String pattern = context.getPrimitives().getStringValue(
+                                                tokens[2]);
+                                String[] result = searchStr.split(pattern, 2);
+                                boolean bFound = result.length > 1;
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SBoolean(bFound));
+                                if (bFound) {
+                                        context.getPrimitives().setValue(tokens[4],
+                                                        new SInteger(result[0].length() + 1));
+                                        context.getPrimitives().setValue(tokens[5],
+                                                        new SInteger(searchStr.length() - result[1].length()));
+                                }
+                        }else if (tokens[0].equals("searchitem")) {
+                                assertExactParametreCount(tokens, 5);
+                                assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                                Text searchItem = (Text)context.getPointers().getVariable(tokens[1]).getValue();
+                                String searchStr = searchItem.getText();
+                                String pattern = context.getPrimitives().getStringValue(
+                                                tokens[2]);
+                                String[] result = searchStr.split(pattern, 2);
+                                boolean bFound = result.length > 1;
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SBoolean(bFound));
+                                if (bFound) {
+//                                      context.getPrimitives().setValue(tokens[4],
+//                                                      new SInteger(1));
+                                        context.getPrimitives().setValue(tokens[4],
+                                                        new SInteger(result[0].length() + 1));
+//                                      context.getPrimitives().setValue(tokens[6],
+//                                                      new SInteger(1));
+                                        context.getPrimitives().setValue(tokens[5],
+                                                        new SInteger(searchStr.length() - result[1].length()));
+                                }
+                        }
                 } else if (tokens[0].startsWith("set")) {
                         if (tokens[0].equals("set")) {
@@ -794 +835 @@
                                 assertExactParametreCount(tokens, 3);
 
-                                Map<String,String> map = (Map<String,String>) context.getPointers().getVariable(tokens[1])
-                                                .getValue();
+                                Map<String, String> map = (Map<String, String>) context
+                                                .getPointers().getVariable(tokens[1]).getValue();
                                 String attribute = context.getPrimitives().getStringValue(
                                                 tokens[2]);