fjsc: added stack effects and parsing performance enhancements

diff --git a/apps/furnace-fjsc/resources/bootstrap.factor b/apps/furnace-fjsc/resources/bootstrap.factor
index 090b395dcb9d8333e4e35d98e0702313da870921..d506d6851893872658b592070389d96fbed7e925 100644 (file)
--- a/apps/furnace-fjsc/resources/bootstrap.factor
+++ b/apps/furnace-fjsc/resources/bootstrap.factor
@@ -1,4 +1,5 @@
-: alert
+: alert ( string -- )
+  #! Display the string in an alert box
   window { } "alert" { "string" } alien-invoke ;
 
 "Bootstrap code loaded" alert
\ No newline at end of file

diff --git a/libs/fjsc/fjsc.factor b/libs/fjsc/fjsc.factor
index b5aa33317da99a3ba91a9ae1dd5d4e8c8c1b769a..40a33a71057ca8e822324008d8642e6b64f97250 100644 (file)
--- a/libs/fjsc/fjsc.factor
+++ b/libs/fjsc/fjsc.factor
@@ -9,17 +9,18 @@ TUPLE: ast-identifier value ;
 TUPLE: ast-string value ;
 TUPLE: ast-quotation expression ;
 TUPLE: ast-array elements ;
-TUPLE: ast-define name expression ;
+TUPLE: ast-define name stack-effect expression ;
 TUPLE: ast-expression values ;
 TUPLE: ast-word value ;
 TUPLE: ast-alien return method args ;
 TUPLE: ast-comment ;
+TUPLE: ast-stack-effect in out ;
 
 LAZY: 'digit' ( -- parser )
   [ digit? ] satisfy [ digit> ] <@ ;
 
 LAZY: 'number' ( -- parser )
-  'digit' <+> [ 0 [ swap 10 * + ] reduce <ast-number> ] <@ ;
+  'digit' <!+> [ 0 [ swap 10 * + ] reduce <ast-number> ] <@ ;
 
 LAZY: 'quote' ( -- parser )
   [ CHAR: " = ] satisfy ;
@@ -28,47 +29,57 @@ LAZY: 'string' ( -- parser )
   'quote' sp [
     CHAR: " = not
   ] satisfy <+> [ >string <ast-string> ] <@ &> 'quote' <& ;
+ 
+: identifier-middle? ( ch -- bool )
+  [ blank? not ] keep
+  [ CHAR: } = not ] keep
+  [ CHAR: ] = not ] keep
+  [ CHAR: " = not ] keep
+  digit? not 
+  and and and and ;
 
 LAZY: 'identifier-ends' ( -- parser )  
   [ 
-    [ blank? not ] keep 
-    [ CHAR: [ = not ] keep 
-    [ CHAR: ] = not ] keep 
-    [ CHAR: { = not ] keep 
-    [ CHAR: } = not ] keep 
-    [ CHAR: : = not ] keep 
-    [ CHAR: " = not ] keep 
-    CHAR: ; = not 
-    and and and and and and and
-  ] satisfy <*> ;
+    [ blank? not ] keep
+    [ CHAR: " = not ] keep
+    [ LETTER? not ] keep
+    [ letter? not ] keep
+    identifier-middle? not
+    and and and and
+  ] satisfy <!*> ;
 
 LAZY: 'identifier-middle' ( -- parser )  
-  [ 
-    [ blank? not ] keep 
-    [ CHAR: [ = not ] keep 
-    [ CHAR: ] = not ] keep 
-    [ CHAR: { = not ] keep 
-    [ CHAR: } = not ] keep 
-    [ CHAR: : = not ] keep 
-    [ CHAR: " = not ] keep 
-    [ CHAR: ; = not ] keep
-    digit? not
-    and and and and and and and and
-  ] satisfy <+> ;
+  [ identifier-middle? ] satisfy <!+> ;
 
 LAZY: 'identifier' ( -- parser )
   'identifier-ends' 
-  'identifier-middle' <&> [ first2 append ] <@
-  'identifier-ends' <&> [ first2 append ] <@
-  [ >string <ast-identifier> ] <@ ;
+  'identifier-middle' <&>
+  'identifier-ends' <:&> 
+  [ concat >string <ast-identifier> ] <@ ;
 
+  
 DEFER: 'expression'
 
+LAZY: 'effect-name' ( -- parser )
+  [ 
+    [ blank? not ] keep
+    CHAR: - = not
+    and    
+  ] satisfy <!+> [ >string ] <@ ;
+
+LAZY: 'stack-effect' ( -- parser )
+  "(" token sp
+  'effect-name' sp <*> &>
+  "--" token sp <&
+  'effect-name' sp <*> <&>
+  ")" token sp <& [ first2 <ast-stack-effect> ] <@ ;
+
 LAZY: 'define' ( -- parser )
   ":" token sp 
   'identifier' sp &>
-  'expression' <&>
-  ";" token sp <& [ first2 <ast-define> ] <@ ;
+  'stack-effect' sp <!?> <&>
+  'expression' <:&>
+  ";" token sp <& [ first3 <ast-define> ] <@ ;
 
 LAZY: 'quotation' ( -- parser )
   "[" token sp 
@@ -110,7 +121,7 @@ LAZY: 'expression' ( -- parser )
   <*> [ <ast-expression> ] <@ ;
 
 LAZY: 'statement' ( -- parser )
-  'define' 'expression' <|> ;
+  'expression' ;
 
 GENERIC: (compile) ( ast -- )
 GENERIC: (literal) ( ast -- )
@@ -200,6 +211,9 @@ M: ast-word (compile)
 M: ast-comment (compile)
   drop "/* */" , ;
 
+M: ast-stack-effect (compile)
+  drop ;
+
 : fjsc-compile ( ast -- string )
   [
     [ (compile) ] { } make [ write ] each

diff --git a/libs/fjsc/tests.factor b/libs/fjsc/tests.factor
index 9c1b33ec090a59d7d9229e92fde2d80788c6be81..ba467021f89ac62b3481abc3c7b5421ff61e1ef0 100644 (file)
--- a/libs/fjsc/tests.factor
+++ b/libs/fjsc/tests.factor
@@ -43,3 +43,23 @@ IN: temporary
 { "factor.data_stack.push(alert.apply(factor.data_stack.pop(), [factor.data_stack.pop()]))" } [
   "{ \"string\" } \"alert\" { \"string\" } alien-invoke" 'expression' parse car parse-result-parsed fjsc-compile
 ] unit-test
+
+{ T{ ast-stack-effect f { } { "d" "e" "f" } } } [
+  "( -- d e f )" 'stack-effect' parse car parse-result-parsed 
+] unit-test
+
+{ T{ ast-stack-effect f { "a" "b" "c" } { "d" "e" "f" } } } [
+  "( a b c -- d e f )" 'stack-effect' parse car parse-result-parsed 
+] unit-test
+
+{ T{ ast-stack-effect f { "a" "b" "c" } { } } } [
+  "( a b c -- )" 'stack-effect' parse car parse-result-parsed 
+] unit-test
+
+{ T{ ast-stack-effect f { } { } } } [
+  "( -- )" 'stack-effect' parse car parse-result-parsed 
+] unit-test
+
+{ } [
+  ": foo ( a b -- c d ) abcdefghijklmn 123 ;" 'expression' parse car drop
+] unit-test
\ No newline at end of file