Changeset 21381

Timestamp:

10/15/08 18:50:32 (5 years ago)

Author:

fujidig

Message:

ユーザ定義関数も動くように

Location:

lang/javascript/hsp-on-js/trunk/src

Files:

• builtin-funcs.js (modified) (1 diff)
• evaluator.js (modified) (1 diff)
• run-in-shell.js (modified) (1 diff)
• t.hsp (modified) (1 diff)

lang/javascript/hsp-on-js/trunk/src/builtin-funcs.js

@@ -34 +34 @@
                 }
                 var frame = this.frameStack.pop();
-                if(val) {
+                if(frame.userDefFunc && frame.userDefFunc.isCType) {
+                        this.stack.push(val);
+                } else if(val) {
                         switch(val.getType()) {
                         case VarType.STR:

lang/javascript/hsp-on-js/trunk/src/evaluator.js

@@ -171 +171 @@
                         break;
                 case Instruction.Code.CALL_USERDEF_CMD:
+                case Instruction.Code.CALL_USERDEF_FUNC:
                         var userDefFunc = insn.opts[0];
                         var argc = insn.opts[1];

lang/javascript/hsp-on-js/trunk/src/run-in-shell.js

@@ -24 +24 @@
         var sequence = compiler.compile();
 
-/*      sequence.forEach(function(insn){
+//*
+sequence.forEach(function(insn){
                 print(insn);
         });
-*/
+//*/
 
         var evaluator = new Evaluator(axdata, sequence);

lang/javascript/hsp-on-js/trunk/src/t.hsp

@@ -1 +1 @@
 #module
-#deffunc foo array a
-        a.0 = a.1
-        return
+#defcfunc fib int n
+        if n < 2 : return 1
+        return fib(n-2) + fib(n-1)
 #global
 
-a = 111, 222
-foo a
-foreach a
-        mes "a."+cnt+" = "+a.cnt
+repeat 10
+        mes "fib("+cnt+") = "+fib(cnt)
 loop