fjsc: fix run-file problems

diff --git a/apps/furnace-fjsc/resources/bootstrap.js b/apps/furnace-fjsc/resources/bootstrap.js
index 562f197d5ce461f0dcba6af315a023daef149aa8..3612382c7f3f8c70f164de91b4def28a3b677a70 100644 (file)
--- a/apps/furnace-fjsc/resources/bootstrap.js
+++ b/apps/furnace-fjsc/resources/bootstrap.js
@@ -145,6 +145,7 @@ Factor.prototype.display_datastack = function() {
    document.getElementById('stack').innerHTML=html.join("");
 }
 
+/* Kernel Vocabulary */
 factor.add_word("kernel","dup", "primitive", function(next) {
   var stack = factor.cont.data_stack;
   stack[stack.length] = stack[stack.length-1];
@@ -191,39 +192,6 @@ factor.add_word("kernel", "r>", "primitive", function(next) {
   factor.call_next(next);
 });
 
-factor.add_word("math", "*", "primitive", function(next) {
-  var stack = factor.cont.data_stack;
-  stack.push(stack.pop() * stack.pop());
-  factor.call_next(next);
-});
-
-factor.add_word("math", "+", "primitive", function(next) {
-  var stack = factor.cont.data_stack;
-  stack.push(stack.pop() + stack.pop());
-  factor.call_next(next);
-});
-
-factor.add_word("math", "-", "primitive", function(next) {
-  var stack = factor.cont.data_stack;
-  var v1 = stack.pop();
-  var v2 = stack.pop();
-  stack.push(v2 - v1);
-  factor.call_next(next);
-});
-
-factor.add_word("math", "/", "primitive", function(next) {
-  var stack = factor.cont.data_stack;
-  var v1 = stack.pop();
-  var v2 = stack.pop();
-  stack.push(v2 / v1);
-  factor.call_next(next);
-});
-
-factor.add_word("prettyprint", ".", "primitive", function(next) {
-  alert(factor.cont.data_stack.pop());
-  factor.call_next(next);
-});
-
 factor.add_word("kernel", "call", "primitive", function(next) {
   var quot = factor.cont.data_stack.pop();
   quot.execute(next);
@@ -268,32 +236,11 @@ factor.add_word("kernel", "=", "primitive", function(next) {
   factor.call_next(next);
 });
 
-factor.add_word("browser-dom", "window", "primitive", function(next) {  
-  factor.cont.data_stack.push(window);
-  factor.call_next(next);
-});
-
 factor.add_word("kernel", "bootstrap", "primitive", function(next) {  
   factor.cont.data_stack.push("/responder/fjsc-resources/bootstrap.factor");
   factor.get_word("parser", "run-file").execute(next);
 });
 
-factor.add_word("parser", "run-file", "primitive", function(next) {  
-  var stack = factor.cont.data_stack;
-  var url = stack.pop();
-  var callback = {
-    success: function(o) {
-      var result = o.responseText;
-      factor.server_eval(result, next);
-    },
-    failure: function(o) {
-      alert('run-file failed');
-      factor.call_next(next);
-    }
-  };
-  YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
-});
-
 factor.add_word("kernel", "callcc0", "primitive", function(next) {  
   var data_stack = factor.cont.data_stack;
   var quot = data_stack.pop();
@@ -318,57 +265,6 @@ factor.add_word("kernel", "continue", "primitive", function(next) {
   factor.call_next(cont.next);
 });
 
-factor.add_word("alien", "alien-invoke", "primitive", function(next) {  
-  var stack = factor.cont.data_stack;
-  var arg_types = stack.pop();
-  var method_name = stack.pop();
-  var library_name = stack.pop();
-  var return_values = stack.pop();
-  var obj = stack.pop();
-  var args = [ ];
-  for(var i = 0; i < arg_types.length; ++i) {
-    args[i] = stack.pop();
-  }
-  var v = obj[method_name].apply(obj, args);
-  if(return_values.length > 0)
-    stack.push(v);
-  factor.call_next(next);
-});
-
-
-factor.add_word("words", "vocabs", "primitive", function(next) {   
-  var stack = factor.cont.data_stack;
-  var result = [];
-  for(v in factor.vocabs) {
-    result.push(v);
-  }
-  stack.push(result);
-  factor.call_next(next);
-});
-
-factor.add_word("words", "words", "primitive", function(next) {   
-  var stack = factor.cont.data_stack;
-  var vocab = factor.vocabs[stack.pop()];
-  var result = [];
-  for(w in vocab) {
-    result.push(vocab[w]);
-  }
-  stack.push(result);
-  factor.call_next(next);
-});
-
-factor.add_word("words", "all-words", "primitive", function(next) {   
-  var stack = factor.cont.data_stack;
-  var result = [];
-  for(v in factor.vocabs) {
-    for(w in factor.vocabs[v]) {
-      result.push(factor.vocabs[v][w]);
-    }
-  }
-  stack.push(result);
-  factor.call_next(next);
-});
-
 factor.add_word("kernel", "in", "primitive", function(next) {   
   var stack = factor.cont.data_stack;
   var vocab = stack.pop();
@@ -420,6 +316,107 @@ factor.add_word("kernel", "current-using", "primitive", function(next) {
   factor.call_next(next);  
 });
 
+/* Math vocabulary */
+factor.add_word("math", "*", "primitive", function(next) {
+  var stack = factor.cont.data_stack;
+  stack.push(stack.pop() * stack.pop());
+  factor.call_next(next);
+});
+
+factor.add_word("math", "+", "primitive", function(next) {
+  var stack = factor.cont.data_stack;
+  stack.push(stack.pop() + stack.pop());
+  factor.call_next(next);
+});
+
+factor.add_word("math", "-", "primitive", function(next) {
+  var stack = factor.cont.data_stack;
+  var v1 = stack.pop();
+  var v2 = stack.pop();
+  stack.push(v2 - v1);
+  factor.call_next(next);
+});
+
+factor.add_word("math", "/", "primitive", function(next) {
+  var stack = factor.cont.data_stack;
+  var v1 = stack.pop();
+  var v2 = stack.pop();
+  stack.push(v2 / v1);
+  factor.call_next(next);
+});
+
+factor.add_word("prettyprint", ".", "primitive", function(next) {
+  alert(factor.cont.data_stack.pop());
+  factor.call_next(next);
+});
+
+factor.add_word("parser", "run-file", "primitive", function(next) {  
+  var stack = factor.cont.data_stack;
+  var url = stack.pop();
+  var callback = {
+    success: function(o) {
+      var result = o.responseText;
+      factor.server_eval(result, next);
+    },
+    failure: function(o) {
+      alert('run-file failed');
+      factor.call_next(next);
+    }
+  };
+  YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
+});
+
+
+factor.add_word("alien", "alien-invoke", "primitive", function(next) {  
+  var stack = factor.cont.data_stack;
+  var arg_types = stack.pop();
+  var method_name = stack.pop();
+  var library_name = stack.pop();
+  var return_values = stack.pop();
+  var obj = stack.pop();
+  var args = [ ];
+  for(var i = 0; i < arg_types.length; ++i) {
+    args[i] = stack.pop();
+  }
+  var v = obj[method_name].apply(obj, args);
+  if(return_values.length > 0)
+    stack.push(v);
+  factor.call_next(next);
+});
+
+factor.add_word("words", "vocabs", "primitive", function(next) {   
+  var stack = factor.cont.data_stack;
+  var result = [];
+  for(v in factor.vocabs) {
+    result.push(v);
+  }
+  stack.push(result);
+  factor.call_next(next);
+});
+
+factor.add_word("words", "words", "primitive", function(next) {   
+  var stack = factor.cont.data_stack;
+  var vocab = factor.vocabs[stack.pop()];
+  var result = [];
+  for(w in vocab) {
+    result.push(vocab[w]);
+  }
+  stack.push(result);
+  factor.call_next(next);
+});
+
+factor.add_word("words", "all-words", "primitive", function(next) {   
+  var stack = factor.cont.data_stack;
+  var result = [];
+  for(v in factor.vocabs) {
+    for(w in factor.vocabs[v]) {
+      result.push(factor.vocabs[v][w]);
+    }
+  }
+  stack.push(result);
+  factor.call_next(next);
+});
+
 /* Sequences vocabulary */
 factor.add_word("sequences", "nth", "primitive", function(next) {   
   var stack = factor.cont.data_stack;
@@ -517,3 +514,14 @@ factor.add_word("sequences", "reduce", "primitive", function(next) {
   stack.push(prev);
   factor.call_next(next);
 });
+
+/* browser-dom vocab */
+factor.add_word("browser-dom", "window", "primitive", function(next) {  
+  factor.cont.data_stack.push(window);
+  factor.call_next(next);
+});
+
+factor.add_word("browser-dom", "document", "primitive", function(next) {  
+  factor.cont.data_stack.push(document);
+  factor.call_next(next);
+});

diff --git a/libs/fjsc/fjsc.factor b/libs/fjsc/fjsc.factor
index 061aa88196bb1564ff71c10c663e450194df179b..08b3ba038c7f738171af6e97ea70749f942aa5df 100644 (file)
--- a/libs/fjsc/fjsc.factor
+++ b/libs/fjsc/fjsc.factor
@@ -33,18 +33,20 @@ LAZY: 'string' ( -- parser )
   [ blank? not ] keep
   [ CHAR: } = not ] keep
   [ CHAR: ] = not ] keep
+  [ CHAR: ;" = not ] keep
   [ CHAR: " = not ] keep
   digit? not 
-  and and and and ;
+  and and and and and ;
 
 LAZY: 'identifier-ends' ( -- parser )  
   [ 
     [ blank? not ] keep
     [ CHAR: " = not ] keep
+    [ CHAR: ;" = not ] keep
     [ LETTER? not ] keep
     [ letter? not ] keep
     identifier-middle? not
-    and and and and
+    and and and and and
   ] satisfy <!*> ;
 
 LAZY: 'identifier-middle' ( -- parser )  
@@ -106,8 +108,8 @@ LAZY: 'comment' ( -- parser )
 LAZY: 'expression' ( -- parser )
   'comment' 
   'quotation' sp <|> 
-  'array' sp <|>
   'define' sp <|>
+  'array' sp <|>
   'word' sp <|>
   'atom' sp <|> 
   <*> [ <ast-expression> ] <@ ;