voor de initialise-variable verandering

IBAF-Editor/syntax/cbs-gen/IBAF-Expressions.sdf3

@@ -38,14 +38,22 @@ context-free syntax // Language
     L-id
   L-exp.L-exp--L-int =
     L-int
-  L-exp.L-exp--R-true =
-    "true"
-  L-exp.L-exp--R-false =
-    "false"
   L-exp.L-exp--L-exp-PLUS-L-exp =
     L-exp "+" L-exp
   L-exp.L-exp--L-exp-DASH-L-exp =
     L-exp "-" L-exp
+  L-exp.L-exp--L-exp-LESS-EQUALS-L-exp =
+    L-exp "<=" L-exp
+  L-exp.L-exp--L-exp-LESS-L-exp =
+    L-exp "<" L-exp
+  L-exp.L-exp--L-id-LPAREN-L-paramvalues-Q-RPAREN =
+    L-id "(" L-paramvalues? ")"
+  L-exp.L-exp--LPAREN-L-exp-RPAREN =
+    "(" L-exp ")"
+  L-exp.L-exp--R-true =
+    "true"
+  L-exp.L-exp--R-false =
+    "false"
   L-exp.L-exp--L-exp-STAR-L-exp =
     L-exp "*" L-exp
   L-exp.L-exp--L-exp-SLASH-L-exp =
@@ -62,14 +70,6 @@ context-free syntax // Language
     L-exp ">=" L-exp
   L-exp.L-exp--L-exp-GREATER-L-exp =
     L-exp ">" L-exp
-  L-exp.L-exp--L-exp-LESS-EQUALS-L-exp =
-    L-exp "<=" L-exp
-  L-exp.L-exp--L-exp-LESS-L-exp =
-    L-exp "<" L-exp
-  L-exp.L-exp--L-id-LPAREN-L-paramvalues-Q-RPAREN =
-    L-id "(" L-paramvalues? ")"
-  L-exp.L-exp--LPAREN-L-exp-RPAREN =
-    "(" L-exp ")"
   
   L-paramvalues.L-paramvalues--L-exp-C-COMMA-L-paramvalues-D-Q =
     L-exp L-COMMA-L-paramvalues?

IBAF-Editor/syntax/cbs-gen/IBAF-Statements.sdf3

@@ -39,6 +39,9 @@ context-free syntax // Language
   // # Statements
                    
   
+  L-block.L-block--LBRACE-L-statement-S-RBRACE =
+    "{" L-statement* "}"
+  
   L-statement.L-statement--L-block =
     L-block
   L-statement.L-statement--R-print-LPAREN-L-exp-RPAREN-SEMI =
@@ -64,9 +67,6 @@ context-free syntax // Language
     "else" L-block
   
   
-  L-block.L-block--LBRACE-L-statement-S-RBRACE =
-    "{" L-statement* "}"
-  
   L-params.L-params--L-id-C-COMMA-L-params-D-Q =
     L-id L-COMMA-L-params?
   
@@ -124,15 +124,15 @@ variables // Meta-variables
   // # Statements
                    
   
-  L-statement = "(:Stmt" [1-9]? ":)" {prefer}
-  L-statement? = "(:Stmt" [1-9]? "?:)" {prefer}
-  L-statement* = "(:Stmt" [1-9]? "*:)" {prefer}
-  L-statement+ = "(:Stmt" [1-9]? "+:)" {prefer}
   L-block = "(:Block" [1-9]? ":)" {prefer}
   L-block? = "(:Block" [1-9]? "?:)" {prefer}
   L-block* = "(:Block" [1-9]? "*:)" {prefer}
   L-block+ = "(:Block" [1-9]? "+:)" {prefer}
   L-statement* = "..." [1-9]? {prefer}
+  L-statement = "(:Stmt" [1-9]? ":)" {prefer}
+  L-statement? = "(:Stmt" [1-9]? "?:)" {prefer}
+  L-statement* = "(:Stmt" [1-9]? "*:)" {prefer}
+  L-statement+ = "(:Stmt" [1-9]? "+:)" {prefer}
   L-params = "(:Params" [1-9]? ":)" {prefer}
   L-params? = "(:Params" [1-9]? "?:)" {prefer}
   L-params* = "(:Params" [1-9]? "*:)" {prefer}

IBAF-Editor/trans/cbs-gen/IBAF-Expressions.str

@@ -54,7 +54,7 @@ to-funcons:
              eval-exp[: (:Exp2:) :]) ]|
 to-funcons:
   |[ eval-exp[: (:Exp1:)||(:Exp2:) :] ]| ->
-  |[ and (eval-exp[: (:Exp1:) :], 
+  |[ or (eval-exp[: (:Exp1:) :], 
              eval-exp[: (:Exp2:) :]) ]|
 to-funcons:
   |[ eval-exp[: (:Exp1:)==(:Exp2:) :] ]| ->
@@ -85,7 +85,7 @@ to-funcons:
   |[ eval-exp[: (:Exp:) :] ]|
 to-funcons:
   |[ eval-params[:  :] ]| ->
-  |[ [] ]|
+  |[ list () ]|
 to-funcons:
   |[ eval-params[: (:Exp:) :] ]| ->
   |[ list (eval-exp[: (:Exp:) :]) ]|