PiccodeScript: Complete overhaul of the syntax to resemble a little bit of JAI

Author: hexaredecimal

editors/Lite/language_piccodescript.lua

@@ -1,3 +1,4 @@
+-- mod-version:3
 local syntax = require "core.syntax"
 
 syntax.add {
@@ -18,13 +19,12 @@ syntax.add {
   symbols = {
     ["import"]         = "keyword",
     ["module"]         = "keyword",
-    ["function"]       = "keyword",
-    ["let"]             = "keyword",
     ["if"]             = "keyword",
     ["else"]           = "keyword",
     ["do"]             = "keyword",
     ["when"]          = "keyword",
     ["is"]             = "keyword",
+    ["await"]             = "keyword",
     ["true"]           = "literal",
     ["false"]          = "literal",
   },

editors/language_piccodescript.lua

@@ -0,0 +1,33 @@
+-- mod-version:3
+local syntax = require "core.syntax"
+
+syntax.add {
+  files = { "%.pics$"},
+  comment = "//",
+  patterns = {
+    { pattern = "//.-\n",               type = "comment"  },
+    { pattern = { "/%*", "%*/" },       type = "comment"  },
+    { pattern = { '"', '"', '\\' },     type = "string"   },
+    { pattern = { "'", "'", '\\' },     type = "string"   },
+    { pattern = "-?0x%x+",              type = "number"   },
+    { pattern = "-?%d+[%d%.eE]*f?",     type = "number"   },
+    { pattern = "-?%.?%d+f?",           type = "number"   },
+    { pattern = "[%+%-=/%*%^%%<>!~|&]", type = "operator" },
+    { pattern = "[%a_][%w_]*%f[(]",     type = "function" },
+    { pattern = "[%a_][%w_]*",          type = "symbol"   },
+  },
+  symbols = {
+    ["import"]         = "keyword",
+    ["module"]         = "keyword",
+    ["function"]       = "keyword",
+    ["let"]             = "keyword",
+    ["if"]             = "keyword",
+    ["else"]           = "keyword",
+    ["do"]             = "keyword",
+    ["when"]          = "keyword",
+    ["is"]             = "keyword",
+    ["true"]           = "literal",
+    ["false"]          = "literal",
+  },
+}
+

src/main/antlr4/PiccodeScript.g4

@@ -13,8 +13,7 @@ stmts: stmt*
 
 stmt:
 	import_module
-	| func
-	| module
+	| declaration
 	| expr_stmt;
 
 import_module:
@@ -29,19 +28,19 @@ symbol_lift
 symbol_entry
 : ID (symbol_lift)? ;
 
+declaration: ID CC (module | func);
 
 module: 
-	MODULE ID LBRACE module_stmts RBRACE;
+	MODULE LBRACE module_stmts RBRACE;
 
 module_stmts:
 	module_stmt*;
 
 module_stmt:
-	func
-	| var_decl
-	| module;
+	declaration
+	| var_decl;
 
-func: FUNCTION ID func_args ASSIGN expr ;
+func: func_args ASSIGN expr ;
 
 func_args: '(' arg_list? ')' ;
 
@@ -64,6 +63,7 @@ expr
 	: expr LPAREN call_expr_list? RPAREN
 	| var_decl
 	| closure_decl
+	| expr CC expr
 	| expr DOT expr
 	| expr MUL expr         
 	| expr DIV expr         
@@ -93,7 +93,6 @@ expr
 	| array
 	| tuple
 	| object
-	| ID
 	| NUMBER                           
 	| STRING                           
 	;
@@ -107,7 +106,7 @@ unary:
 	| BAND expr;
 
 if_expr:
-	IF expr LBRACE expr RBRACE ELSE LBRACE expr RBRACE;
+	IF expr LBRACE expr* RBRACE (ELSE LBRACE expr* RBRACE)?;
 
 when_expr: 
  WHEN expr LBRACE when_cases else_case? RBRACE;
@@ -118,7 +117,7 @@ when_case: IS expr_list ARROW expr;
 
 else_case: ELSE ARROW expr;
 
-var_decl: LET ID ASSIGN expr;
+var_decl: ID (DASSIGN expr)?;
 tuple: LPAREN expr_list RPAREN;
 array: LBRACKET expr_list? RBRACKET;
 object: LBRACE key_val_pairs RBRACE;
@@ -157,6 +156,7 @@ BAND: '&';
 BOR: '|';
 EXCLAIM : '!';
 PIPE: '|>';
+CC: '::';
 
 LBRACE: '{';
 RBRACE: '}';
@@ -172,9 +172,8 @@ TILDE: '~';
 
 
 ASSIGN: '=';
+DASSIGN: ':=';
 
-LET: 'let';
-FUNCTION: 'function';
 WHEN: 'when';
 IMPORT: 'import';
 IS: 'is';

src/main/java/org/piccode/antlr4/PiccodeScript.interp

@@ -17,20 +17,20 @@ BAND=16
 BOR=17
 EXCLAIM=18
 PIPE=19
-LBRACE=20
-RBRACE=21
-LPAREN=22
-RPAREN=23
-LBRACKET=24
-RBRACKET=25
-COLON=26
-COMMA=27
-SEMI=28
-ARROW=29
-TILDE=30
-ASSIGN=31
-LET=32
-FUNCTION=33
+CC=20
+LBRACE=21
+RBRACE=22
+LPAREN=23
+RPAREN=24
+LBRACKET=25
+RBRACKET=26
+COLON=27
+COMMA=28
+SEMI=29
+ARROW=30
+TILDE=31
+ASSIGN=32
+DASSIGN=33
 WHEN=34
 IMPORT=35
 IS=36
@@ -64,20 +64,20 @@ WS=47
 '|'=17
 '!'=18
 '|>'=19
-'{'=20
-'}'=21
-'('=22
-')'=23
-'['=24
-']'=25
-':'=26
-','=27
-';'=28
-'->'=29
-'~'=30
-'='=31
-'let'=32
-'function'=33
+'::'=20
+'{'=21
+'}'=22
+'('=23
+')'=24
+'['=25
+']'=26
+':'=27
+','=28
+';'=29
+'->'=30
+'~'=31
+'='=32
+':='=33
 'when'=34
 'import'=35
 'is'=36

src/main/java/org/piccode/antlr4/PiccodeScript.tokens

@@ -85,6 +85,18 @@ public class PiccodeScriptBaseListener implements PiccodeScriptListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitSymbol_entry(PiccodeScriptParser.Symbol_entryContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDeclaration(PiccodeScriptParser.DeclarationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDeclaration(PiccodeScriptParser.DeclarationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/org/piccode/antlr4/PiccodeScriptBaseListener.java

@@ -55,6 +55,13 @@ public class PiccodeScriptBaseVisitor<T> extends AbstractParseTreeVisitor<T> imp
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitSymbol_entry(PiccodeScriptParser.Symbol_entryContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitDeclaration(PiccodeScriptParser.DeclarationContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *