[Gzz-commits] gzz/lava/gzz/client PotionFallbackBinder.java

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/06 07:11:46

Modified files:
        lava/gzz/client: PotionFallbackBinder.java 

Log message:
        Stuff from Sarah

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/client/PotionFallbackBinder.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/client/PotionFallbackBinder.java
diff -u gzz/lava/gzz/client/PotionFallbackBinder.java:1.5 
gzz/lava/gzz/client/PotionFallbackBinder.java:1.6
--- gzz/lava/gzz/client/PotionFallbackBinder.java:1.5   Mon Jan  6 06:57:29 2003
+++ gzz/lava/gzz/client/PotionFallbackBinder.java       Mon Jan  6 07:11:46 2003
@@ -10,6 +10,7 @@
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
 
+    public FunctionExpression currentFunctionExpression;
     public CommandCall currentCommand;
     public int currentWin;
 
@@ -63,11 +64,27 @@
            // no binding for this key: clear pending
            currentCommand = null;
            AbstractUpdateManager.chg();
+        } else if(binding instanceof FunctionExpression){
+           FunctionExpression f = (FunctionExpression)binding;  
+           if(currentCommand==null){
+               currentFunctionExpression = f;
+           } else {
+               Map context = getContext(fallback.windows[currentWin], k);
+               currentCommand = (CommandCall)currentCommand.setNextParam(f);
+               if(currentCommand.isComplete()) {
+                   if(dbg) pa("Execute: "+currentCommand);
+                   currentCommand.execute(context);
+                   currentCommand = null;
+               }
+           }
        } else if(binding instanceof Action) {
            Action action = (Action)binding;
            currentCommand = action.command;
            currentWin = action.window;
            if(dbg) pa("Replaced currentCommand.");
+           if(currentFunctionExpression!=null)
+               currentCommand = 
(CommandCall)currentCommand.setNextParam(currentFunctionExpression);
+           currentFunctionExpression=null;
            if(currentCommand.isComplete()) {
                if(dbg) pa("Execute: "+currentCommand);
                Map context = getContext(fallback.windows[currentWin], k);