cariboujs 2.0.7 → 2.0.9

package/asm/asm8080/asm8080Visitor.js

@@ -24,6 +24,12 @@ export default class asm8080Visitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
+	// Visit a parse tree produced by asm8080Parser#macrocall.
+	visitMacrocall(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by asm8080Parser#opcode.
 	visitOpcode(ctx) {
 	  return this.visitChildren(ctx);
@@ -72,12 +78,54 @@ export default class asm8080Visitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
+	// Visit a parse tree produced by asm8080Parser#orExpression.
+	visitOrExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
+	// Visit a parse tree produced by asm8080Parser#xorExpression.
+	visitXorExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
+	// Visit a parse tree produced by asm8080Parser#andExpression.
+	visitAndExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
+	// Visit a parse tree produced by asm8080Parser#addExpression.
+	visitAddExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
+	// Visit a parse tree produced by asm8080Parser#shiftExpression.
+	visitShiftExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
+	// Visit a parse tree produced by asm8080Parser#modExpression.
+	visitModExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by asm8080Parser#multiplyingExpression.
 	visitMultiplyingExpression(ctx) {
 	  return this.visitChildren(ctx);
 	}
 
 
+	// Visit a parse tree produced by asm8080Parser#unaryExpression.
+	visitUnaryExpression(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by asm8080Parser#argument.
 	visitArgument(ctx) {
 	  return this.visitChildren(ctx);

package/asm/asmZ80/asmZ80Lexer.js

@@ -3,15 +3,16 @@
 import antlr4 from 'antlr4';
 
 
-const serializedATN = [4,0,18,368,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
+const serializedATN = [4,0,20,428,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
 4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,
-12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,1,0,1,0,1,1,1,1,1,2,
-1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,6,1,6,1,7,1,7,1,8,1,8,1,9,1,9,1,9,1,9,1,9,
+12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7,19,
+1,0,1,0,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,6,1,6,1,7,1,7,1,8,1,8,
 1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,
-1,9,1,9,1,9,1,9,1,9,1,9,3,9,85,8,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,
+1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,3,9,93,8,9,1,
 10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,
-1,10,1,10,1,10,1,10,1,10,1,10,1,10,3,10,116,8,10,1,11,1,11,1,11,1,11,1,11,
-1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
+1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,
+10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,3,10,137,
+8,10,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
 11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,
 1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
 11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,
@@ -24,122 +25,143 @@ const serializedATN = [4,0,18,368,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
 1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
 11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,
 1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
-11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,3,11,324,
-8,11,1,12,1,12,5,12,328,8,12,10,12,12,12,331,9,12,1,13,3,13,334,8,13,1,13,
-4,13,337,8,13,11,13,12,13,338,1,13,3,13,342,8,13,1,14,1,14,5,14,346,8,14,
-10,14,12,14,349,9,14,1,15,1,15,5,15,353,8,15,10,15,12,15,356,9,15,1,15,1,
-15,1,16,4,16,361,8,16,11,16,12,16,362,1,17,1,17,1,17,1,17,0,0,18,1,1,3,2,
-5,3,7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,12,25,13,27,14,29,15,31,16,
-33,17,35,18,1,0,31,8,0,65,70,72,73,76,76,82,82,97,102,104,105,108,108,114,
-114,2,0,73,73,105,105,2,0,88,88,120,120,2,0,72,72,104,104,2,0,76,76,108,
-108,2,0,89,89,121,121,2,0,65,65,97,97,2,0,70,70,102,102,2,0,66,66,98,98,
-2,0,67,67,99,99,2,0,68,68,100,100,2,0,69,69,101,101,2,0,80,80,112,112,2,
-0,83,83,115,115,2,0,79,79,111,111,2,0,82,82,114,114,2,0,71,71,103,103,2,
-0,78,78,110,110,2,0,81,81,113,113,2,0,85,85,117,117,2,0,87,87,119,119,2,
-0,84,84,116,116,2,0,74,74,106,106,2,0,90,90,122,122,2,0,77,77,109,109,2,
-0,65,90,97,122,5,0,34,34,46,46,48,57,65,90,97,122,3,0,48,57,65,70,97,102,
-2,0,10,10,13,13,1,0,39,39,2,0,9,9,32,32,460,0,1,1,0,0,0,0,3,1,0,0,0,0,5,
-1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,
-17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,
-0,0,0,29,1,0,0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,1,37,1,0,0,0,3,39,
-1,0,0,0,5,41,1,0,0,0,7,43,1,0,0,0,9,45,1,0,0,0,11,47,1,0,0,0,13,49,1,0,0,
-0,15,51,1,0,0,0,17,53,1,0,0,0,19,84,1,0,0,0,21,115,1,0,0,0,23,323,1,0,0,
-0,25,325,1,0,0,0,27,333,1,0,0,0,29,343,1,0,0,0,31,350,1,0,0,0,33,360,1,0,
-0,0,35,364,1,0,0,0,37,38,5,58,0,0,38,2,1,0,0,0,39,40,5,44,0,0,40,4,1,0,0,
-0,41,42,5,43,0,0,42,6,1,0,0,0,43,44,5,45,0,0,44,8,1,0,0,0,45,46,5,42,0,0,
-46,10,1,0,0,0,47,48,5,47,0,0,48,12,1,0,0,0,49,50,5,40,0,0,50,14,1,0,0,0,
-51,52,5,41,0,0,52,16,1,0,0,0,53,54,5,36,0,0,54,18,1,0,0,0,55,85,7,0,0,0,
-56,57,7,1,0,0,57,58,7,2,0,0,58,85,7,3,0,0,59,60,7,1,0,0,60,61,7,2,0,0,61,
-85,7,4,0,0,62,63,7,1,0,0,63,64,7,5,0,0,64,85,7,3,0,0,65,66,7,1,0,0,66,67,
-7,5,0,0,67,85,7,4,0,0,68,69,7,6,0,0,69,85,7,7,0,0,70,71,7,8,0,0,71,85,7,
-9,0,0,72,73,7,10,0,0,73,85,7,11,0,0,74,75,7,3,0,0,75,85,7,4,0,0,76,77,7,
-12,0,0,77,85,7,9,0,0,78,79,7,13,0,0,79,85,7,12,0,0,80,81,7,1,0,0,81,85,7,
-2,0,0,82,83,7,1,0,0,83,85,7,5,0,0,84,55,1,0,0,0,84,56,1,0,0,0,84,59,1,0,
-0,0,84,62,1,0,0,0,84,65,1,0,0,0,84,68,1,0,0,0,84,70,1,0,0,0,84,72,1,0,0,
-0,84,74,1,0,0,0,84,76,1,0,0,0,84,78,1,0,0,0,84,80,1,0,0,0,84,82,1,0,0,0,
-85,20,1,0,0,0,86,87,7,14,0,0,87,88,7,15,0,0,88,116,7,16,0,0,89,90,7,11,0,
-0,90,91,7,17,0,0,91,116,7,10,0,0,92,93,7,11,0,0,93,94,7,18,0,0,94,116,7,
-19,0,0,95,96,7,10,0,0,96,97,7,11,0,0,97,98,7,7,0,0,98,116,7,8,0,0,99,100,
-7,10,0,0,100,101,7,11,0,0,101,102,7,7,0,0,102,116,7,20,0,0,103,104,7,10,
-0,0,104,116,7,13,0,0,105,106,7,1,0,0,106,116,7,7,0,0,107,108,7,11,0,0,108,
-109,7,17,0,0,109,110,7,10,0,0,110,111,7,1,0,0,111,116,7,7,0,0,112,113,7,
-13,0,0,113,114,7,11,0,0,114,116,7,21,0,0,115,86,1,0,0,0,115,89,1,0,0,0,115,
-92,1,0,0,0,115,95,1,0,0,0,115,99,1,0,0,0,115,103,1,0,0,0,115,105,1,0,0,0,
-115,107,1,0,0,0,115,112,1,0,0,0,116,22,1,0,0,0,117,118,7,6,0,0,118,119,7,
-10,0,0,119,324,7,9,0,0,120,121,7,6,0,0,121,122,7,10,0,0,122,324,7,10,0,0,
-123,124,7,6,0,0,124,125,7,17,0,0,125,324,7,10,0,0,126,127,7,8,0,0,127,128,
-7,1,0,0,128,324,7,21,0,0,129,130,7,9,0,0,130,131,7,6,0,0,131,132,7,4,0,0,
-132,324,7,4,0,0,133,134,7,9,0,0,134,135,7,9,0,0,135,324,7,7,0,0,136,137,
-7,9,0,0,137,324,7,12,0,0,138,139,7,9,0,0,139,140,7,12,0,0,140,324,7,10,0,
-0,141,142,7,9,0,0,142,143,7,12,0,0,143,144,7,10,0,0,144,324,7,15,0,0,145,
-146,7,9,0,0,146,147,7,12,0,0,147,324,7,1,0,0,148,149,7,9,0,0,149,150,7,12,
-0,0,150,151,7,1,0,0,151,324,7,15,0,0,152,153,7,9,0,0,153,154,7,12,0,0,154,
-324,7,4,0,0,155,156,7,10,0,0,156,157,7,6,0,0,157,324,7,6,0,0,158,159,7,10,
-0,0,159,160,7,11,0,0,160,324,7,9,0,0,161,162,7,10,0,0,162,324,7,1,0,0,163,
-164,7,10,0,0,164,165,7,22,0,0,165,166,7,17,0,0,166,324,7,23,0,0,167,168,
-7,11,0,0,168,324,7,1,0,0,169,170,7,11,0,0,170,324,7,2,0,0,171,172,7,11,0,
-0,172,173,7,2,0,0,173,324,7,2,0,0,174,175,7,1,0,0,175,324,7,24,0,0,176,177,
-7,1,0,0,177,324,7,17,0,0,178,179,7,1,0,0,179,180,7,17,0,0,180,324,7,9,0,
-0,181,182,7,1,0,0,182,183,7,17,0,0,183,324,7,10,0,0,184,185,7,1,0,0,185,
-186,7,17,0,0,186,187,7,10,0,0,187,324,7,15,0,0,188,189,7,1,0,0,189,190,7,
-17,0,0,190,324,7,1,0,0,191,192,7,1,0,0,192,193,7,17,0,0,193,194,7,1,0,0,
-194,324,7,15,0,0,195,196,7,22,0,0,196,324,7,12,0,0,197,198,7,22,0,0,198,
-324,7,15,0,0,199,200,7,4,0,0,200,324,7,10,0,0,201,202,7,4,0,0,202,203,7,
-10,0,0,203,324,7,10,0,0,204,205,7,4,0,0,205,206,7,10,0,0,206,207,7,10,0,
-0,207,324,7,15,0,0,208,209,7,4,0,0,209,210,7,10,0,0,210,324,7,1,0,0,211,
-212,7,4,0,0,212,213,7,10,0,0,213,214,7,1,0,0,214,324,7,15,0,0,215,216,7,
-17,0,0,216,217,7,11,0,0,217,324,7,16,0,0,218,219,7,17,0,0,219,220,7,14,0,
-0,220,324,7,12,0,0,221,222,7,14,0,0,222,324,7,15,0,0,223,224,7,14,0,0,224,
-225,7,21,0,0,225,226,7,10,0,0,226,324,7,15,0,0,227,228,7,14,0,0,228,229,
-7,21,0,0,229,230,7,1,0,0,230,324,7,15,0,0,231,232,7,14,0,0,232,233,7,19,
-0,0,233,324,7,21,0,0,234,235,7,14,0,0,235,236,7,19,0,0,236,237,7,21,0,0,
-237,324,7,10,0,0,238,239,7,14,0,0,239,240,7,19,0,0,240,241,7,21,0,0,241,
-324,7,1,0,0,242,243,7,12,0,0,243,244,7,14,0,0,244,324,7,12,0,0,245,246,7,
-12,0,0,246,247,7,19,0,0,247,248,7,13,0,0,248,324,7,3,0,0,249,250,7,15,0,
-0,250,251,7,11,0,0,251,324,7,13,0,0,252,253,7,15,0,0,253,254,7,11,0,0,254,
-324,7,21,0,0,255,256,7,15,0,0,256,257,7,11,0,0,257,258,7,21,0,0,258,324,
-7,1,0,0,259,260,7,15,0,0,260,261,7,11,0,0,261,262,7,21,0,0,262,324,7,17,
-0,0,263,264,7,15,0,0,264,324,7,4,0,0,265,266,7,15,0,0,266,267,7,4,0,0,267,
-324,7,6,0,0,268,269,7,15,0,0,269,270,7,4,0,0,270,324,7,9,0,0,271,272,7,15,
-0,0,272,273,7,4,0,0,273,274,7,9,0,0,274,324,7,6,0,0,275,276,7,15,0,0,276,
-277,7,4,0,0,277,324,7,10,0,0,278,279,7,15,0,0,279,324,7,15,0,0,280,281,7,
-15,0,0,281,282,7,15,0,0,282,324,7,6,0,0,283,284,7,15,0,0,284,285,7,15,0,
-0,285,324,7,9,0,0,286,287,7,15,0,0,287,288,7,15,0,0,288,289,7,9,0,0,289,
-324,7,6,0,0,290,291,7,15,0,0,291,292,7,15,0,0,292,324,7,10,0,0,293,294,7,
-15,0,0,294,295,7,13,0,0,295,324,7,21,0,0,296,297,7,13,0,0,297,298,7,8,0,
-0,298,324,7,9,0,0,299,300,7,13,0,0,300,301,7,9,0,0,301,324,7,7,0,0,302,303,
-7,13,0,0,303,304,7,4,0,0,304,324,7,6,0,0,305,306,7,13,0,0,306,307,7,4,0,
-0,307,324,7,4,0,0,308,309,7,13,0,0,309,310,7,4,0,0,310,324,5,49,0,0,311,
-312,7,13,0,0,312,313,7,15,0,0,313,324,7,6,0,0,314,315,7,13,0,0,315,316,7,
-15,0,0,316,324,7,4,0,0,317,318,7,13,0,0,318,319,7,19,0,0,319,324,7,8,0,0,
-320,321,7,2,0,0,321,322,7,14,0,0,322,324,7,15,0,0,323,117,1,0,0,0,323,120,
-1,0,0,0,323,123,1,0,0,0,323,126,1,0,0,0,323,129,1,0,0,0,323,133,1,0,0,0,
-323,136,1,0,0,0,323,138,1,0,0,0,323,141,1,0,0,0,323,145,1,0,0,0,323,148,
-1,0,0,0,323,152,1,0,0,0,323,155,1,0,0,0,323,158,1,0,0,0,323,161,1,0,0,0,
-323,163,1,0,0,0,323,167,1,0,0,0,323,169,1,0,0,0,323,171,1,0,0,0,323,174,
-1,0,0,0,323,176,1,0,0,0,323,178,1,0,0,0,323,181,1,0,0,0,323,184,1,0,0,0,
-323,188,1,0,0,0,323,191,1,0,0,0,323,195,1,0,0,0,323,197,1,0,0,0,323,199,
-1,0,0,0,323,201,1,0,0,0,323,204,1,0,0,0,323,208,1,0,0,0,323,211,1,0,0,0,
-323,215,1,0,0,0,323,218,1,0,0,0,323,221,1,0,0,0,323,223,1,0,0,0,323,227,
-1,0,0,0,323,231,1,0,0,0,323,234,1,0,0,0,323,238,1,0,0,0,323,242,1,0,0,0,
-323,245,1,0,0,0,323,249,1,0,0,0,323,252,1,0,0,0,323,255,1,0,0,0,323,259,
-1,0,0,0,323,263,1,0,0,0,323,265,1,0,0,0,323,268,1,0,0,0,323,271,1,0,0,0,
-323,275,1,0,0,0,323,278,1,0,0,0,323,280,1,0,0,0,323,283,1,0,0,0,323,286,
-1,0,0,0,323,290,1,0,0,0,323,293,1,0,0,0,323,296,1,0,0,0,323,299,1,0,0,0,
-323,302,1,0,0,0,323,305,1,0,0,0,323,308,1,0,0,0,323,311,1,0,0,0,323,314,
-1,0,0,0,323,317,1,0,0,0,323,320,1,0,0,0,324,24,1,0,0,0,325,329,7,25,0,0,
-326,328,7,26,0,0,327,326,1,0,0,0,328,331,1,0,0,0,329,327,1,0,0,0,329,330,
-1,0,0,0,330,26,1,0,0,0,331,329,1,0,0,0,332,334,5,36,0,0,333,332,1,0,0,0,
-333,334,1,0,0,0,334,336,1,0,0,0,335,337,7,27,0,0,336,335,1,0,0,0,337,338,
-1,0,0,0,338,336,1,0,0,0,338,339,1,0,0,0,339,341,1,0,0,0,340,342,7,3,0,0,
-341,340,1,0,0,0,341,342,1,0,0,0,342,28,1,0,0,0,343,347,5,59,0,0,344,346,
-8,28,0,0,345,344,1,0,0,0,346,349,1,0,0,0,347,345,1,0,0,0,347,348,1,0,0,0,
-348,30,1,0,0,0,349,347,1,0,0,0,350,354,5,39,0,0,351,353,8,29,0,0,352,351,
-1,0,0,0,353,356,1,0,0,0,354,352,1,0,0,0,354,355,1,0,0,0,355,357,1,0,0,0,
-356,354,1,0,0,0,357,358,5,39,0,0,358,32,1,0,0,0,359,361,7,28,0,0,360,359,
-1,0,0,0,361,362,1,0,0,0,362,360,1,0,0,0,362,363,1,0,0,0,363,34,1,0,0,0,364,
-365,7,30,0,0,365,366,1,0,0,0,366,367,6,17,0,0,367,36,1,0,0,0,11,0,84,115,
-323,329,333,338,341,347,354,362,1,6,0,0];
+11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,
+1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,3,11,349,8,11,1,12,3,12,352,8,12,
+1,12,1,12,5,12,356,8,12,10,12,12,12,359,9,12,1,13,3,13,362,8,13,1,13,4,13,
+365,8,13,11,13,12,13,366,1,13,3,13,370,8,13,1,13,1,13,1,13,1,13,4,13,376,
+8,13,11,13,12,13,377,3,13,380,8,13,1,14,1,14,5,14,384,8,14,10,14,12,14,387,
+9,14,1,15,1,15,1,15,1,15,5,15,393,8,15,10,15,12,15,396,9,15,1,15,1,15,1,
+16,1,16,1,16,1,16,5,16,404,8,16,10,16,12,16,407,9,16,1,16,1,16,1,17,1,17,
+5,17,413,8,17,10,17,12,17,416,9,17,1,17,1,17,1,18,4,18,421,8,18,11,18,12,
+18,422,1,19,1,19,1,19,1,19,0,0,20,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,
+9,19,10,21,11,23,12,25,13,27,14,29,15,31,16,33,17,35,18,37,19,39,20,1,0,
+33,8,0,65,70,72,73,76,76,82,82,97,102,104,105,108,108,114,114,2,0,73,73,
+105,105,2,0,88,88,120,120,2,0,72,72,104,104,2,0,76,76,108,108,2,0,89,89,
+121,121,2,0,65,65,97,97,2,0,70,70,102,102,2,0,66,66,98,98,2,0,67,67,99,99,
+2,0,68,68,100,100,2,0,69,69,101,101,2,0,80,80,112,112,2,0,83,83,115,115,
+2,0,79,79,111,111,2,0,82,82,114,114,2,0,71,71,103,103,2,0,78,78,110,110,
+2,0,81,81,113,113,2,0,85,85,117,117,2,0,87,87,119,119,2,0,84,84,116,116,
+2,0,77,77,109,109,2,0,74,74,106,106,2,0,90,90,122,122,2,0,65,90,97,122,6,
+0,34,34,46,46,48,57,65,90,95,95,97,122,3,0,48,57,65,70,97,102,2,0,10,10,
+13,13,4,0,10,10,13,13,39,39,92,92,4,0,10,10,13,13,34,34,92,92,3,0,10,10,
+13,13,39,39,2,0,9,9,32,32,533,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,
+0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,
+19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,
+0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,1,41,
+1,0,0,0,3,43,1,0,0,0,5,45,1,0,0,0,7,47,1,0,0,0,9,49,1,0,0,0,11,51,1,0,0,
+0,13,53,1,0,0,0,15,55,1,0,0,0,17,57,1,0,0,0,19,92,1,0,0,0,21,136,1,0,0,0,
+23,348,1,0,0,0,25,351,1,0,0,0,27,379,1,0,0,0,29,381,1,0,0,0,31,388,1,0,0,
+0,33,399,1,0,0,0,35,410,1,0,0,0,37,420,1,0,0,0,39,424,1,0,0,0,41,42,5,58,
+0,0,42,2,1,0,0,0,43,44,5,44,0,0,44,4,1,0,0,0,45,46,5,45,0,0,46,6,1,0,0,0,
+47,48,5,43,0,0,48,8,1,0,0,0,49,50,5,42,0,0,50,10,1,0,0,0,51,52,5,47,0,0,
+52,12,1,0,0,0,53,54,5,40,0,0,54,14,1,0,0,0,55,56,5,41,0,0,56,16,1,0,0,0,
+57,58,5,36,0,0,58,18,1,0,0,0,59,93,7,0,0,0,60,61,7,1,0,0,61,62,7,2,0,0,62,
+93,7,3,0,0,63,64,7,1,0,0,64,65,7,2,0,0,65,93,7,4,0,0,66,67,7,1,0,0,67,68,
+7,5,0,0,68,93,7,3,0,0,69,70,7,1,0,0,70,71,7,5,0,0,71,93,7,4,0,0,72,73,7,
+6,0,0,73,74,7,7,0,0,74,75,1,0,0,0,75,93,5,39,0,0,76,77,7,6,0,0,77,93,7,7,
+0,0,78,79,7,8,0,0,79,93,7,9,0,0,80,81,7,10,0,0,81,93,7,11,0,0,82,83,7,3,
+0,0,83,93,7,4,0,0,84,85,7,12,0,0,85,93,7,9,0,0,86,87,7,13,0,0,87,93,7,12,
+0,0,88,89,7,1,0,0,89,93,7,2,0,0,90,91,7,1,0,0,91,93,7,5,0,0,92,59,1,0,0,
+0,92,60,1,0,0,0,92,63,1,0,0,0,92,66,1,0,0,0,92,69,1,0,0,0,92,72,1,0,0,0,
+92,76,1,0,0,0,92,78,1,0,0,0,92,80,1,0,0,0,92,82,1,0,0,0,92,84,1,0,0,0,92,
+86,1,0,0,0,92,88,1,0,0,0,92,90,1,0,0,0,93,20,1,0,0,0,94,95,7,14,0,0,95,96,
+7,15,0,0,96,137,7,16,0,0,97,98,7,11,0,0,98,99,7,17,0,0,99,137,7,10,0,0,100,
+101,7,11,0,0,101,102,7,18,0,0,102,137,7,19,0,0,103,104,7,10,0,0,104,137,
+7,8,0,0,105,106,7,10,0,0,106,107,7,11,0,0,107,108,7,7,0,0,108,137,7,8,0,
+0,109,110,7,10,0,0,110,137,7,20,0,0,111,112,7,10,0,0,112,113,7,11,0,0,113,
+114,7,7,0,0,114,137,7,20,0,0,115,116,7,10,0,0,116,137,7,13,0,0,117,118,7,
+1,0,0,118,137,7,7,0,0,119,120,7,11,0,0,120,121,7,17,0,0,121,122,7,10,0,0,
+122,123,7,1,0,0,123,137,7,7,0,0,124,125,7,13,0,0,125,126,7,11,0,0,126,137,
+7,21,0,0,127,128,7,22,0,0,128,129,7,6,0,0,129,130,7,9,0,0,130,131,7,15,0,
+0,131,137,7,14,0,0,132,133,7,11,0,0,133,134,7,17,0,0,134,135,7,10,0,0,135,
+137,7,22,0,0,136,94,1,0,0,0,136,97,1,0,0,0,136,100,1,0,0,0,136,103,1,0,0,
+0,136,105,1,0,0,0,136,109,1,0,0,0,136,111,1,0,0,0,136,115,1,0,0,0,136,117,
+1,0,0,0,136,119,1,0,0,0,136,124,1,0,0,0,136,127,1,0,0,0,136,132,1,0,0,0,
+137,22,1,0,0,0,138,139,7,6,0,0,139,140,7,10,0,0,140,349,7,9,0,0,141,142,
+7,6,0,0,142,143,7,10,0,0,143,349,7,10,0,0,144,145,7,6,0,0,145,146,7,17,0,
+0,146,349,7,10,0,0,147,148,7,8,0,0,148,149,7,1,0,0,149,349,7,21,0,0,150,
+151,7,9,0,0,151,152,7,6,0,0,152,153,7,4,0,0,153,349,7,4,0,0,154,155,7,9,
+0,0,155,156,7,9,0,0,156,349,7,7,0,0,157,158,7,9,0,0,158,349,7,12,0,0,159,
+160,7,9,0,0,160,161,7,12,0,0,161,349,7,10,0,0,162,163,7,9,0,0,163,164,7,
+12,0,0,164,165,7,10,0,0,165,349,7,15,0,0,166,167,7,9,0,0,167,168,7,12,0,
+0,168,349,7,1,0,0,169,170,7,9,0,0,170,171,7,12,0,0,171,172,7,1,0,0,172,349,
+7,15,0,0,173,174,7,9,0,0,174,175,7,12,0,0,175,349,7,4,0,0,176,177,7,10,0,
+0,177,178,7,6,0,0,178,349,7,6,0,0,179,180,7,10,0,0,180,181,7,11,0,0,181,
+349,7,9,0,0,182,183,7,10,0,0,183,349,7,1,0,0,184,185,7,10,0,0,185,186,7,
+23,0,0,186,187,7,17,0,0,187,349,7,24,0,0,188,189,7,11,0,0,189,349,7,1,0,
+0,190,191,7,11,0,0,191,349,7,2,0,0,192,193,7,11,0,0,193,194,7,2,0,0,194,
+349,7,2,0,0,195,196,7,3,0,0,196,197,7,6,0,0,197,198,7,4,0,0,198,349,7,21,
+0,0,199,200,7,1,0,0,200,349,7,22,0,0,201,202,7,1,0,0,202,349,7,17,0,0,203,
+204,7,1,0,0,204,205,7,17,0,0,205,349,7,9,0,0,206,207,7,1,0,0,207,208,7,17,
+0,0,208,349,7,10,0,0,209,210,7,1,0,0,210,211,7,17,0,0,211,212,7,10,0,0,212,
+349,7,15,0,0,213,214,7,1,0,0,214,215,7,17,0,0,215,349,7,1,0,0,216,217,7,
+1,0,0,217,218,7,17,0,0,218,219,7,1,0,0,219,349,7,15,0,0,220,221,7,23,0,0,
+221,349,7,12,0,0,222,223,7,23,0,0,223,349,7,15,0,0,224,225,7,4,0,0,225,349,
+7,10,0,0,226,227,7,4,0,0,227,228,7,10,0,0,228,349,7,10,0,0,229,230,7,4,0,
+0,230,231,7,10,0,0,231,232,7,10,0,0,232,349,7,15,0,0,233,234,7,4,0,0,234,
+235,7,10,0,0,235,349,7,1,0,0,236,237,7,4,0,0,237,238,7,10,0,0,238,239,7,
+1,0,0,239,349,7,15,0,0,240,241,7,17,0,0,241,242,7,11,0,0,242,349,7,16,0,
+0,243,244,7,17,0,0,244,245,7,14,0,0,245,349,7,12,0,0,246,247,7,14,0,0,247,
+349,7,15,0,0,248,249,7,14,0,0,249,250,7,21,0,0,250,251,7,10,0,0,251,349,
+7,15,0,0,252,253,7,14,0,0,253,254,7,21,0,0,254,255,7,1,0,0,255,349,7,15,
+0,0,256,257,7,14,0,0,257,258,7,19,0,0,258,349,7,21,0,0,259,260,7,14,0,0,
+260,261,7,19,0,0,261,262,7,21,0,0,262,349,7,10,0,0,263,264,7,14,0,0,264,
+265,7,19,0,0,265,266,7,21,0,0,266,349,7,1,0,0,267,268,7,12,0,0,268,269,7,
+14,0,0,269,349,7,12,0,0,270,271,7,12,0,0,271,272,7,19,0,0,272,273,7,13,0,
+0,273,349,7,3,0,0,274,275,7,15,0,0,275,276,7,11,0,0,276,349,7,13,0,0,277,
+278,7,15,0,0,278,279,7,11,0,0,279,349,7,21,0,0,280,281,7,15,0,0,281,282,
+7,11,0,0,282,283,7,21,0,0,283,349,7,1,0,0,284,285,7,15,0,0,285,286,7,11,
+0,0,286,287,7,21,0,0,287,349,7,17,0,0,288,289,7,15,0,0,289,349,7,4,0,0,290,
+291,7,15,0,0,291,292,7,4,0,0,292,349,7,6,0,0,293,294,7,15,0,0,294,295,7,
+4,0,0,295,349,7,9,0,0,296,297,7,15,0,0,297,298,7,4,0,0,298,299,7,9,0,0,299,
+349,7,6,0,0,300,301,7,15,0,0,301,302,7,4,0,0,302,349,7,10,0,0,303,304,7,
+15,0,0,304,349,7,15,0,0,305,306,7,15,0,0,306,307,7,15,0,0,307,349,7,6,0,
+0,308,309,7,15,0,0,309,310,7,15,0,0,310,349,7,9,0,0,311,312,7,15,0,0,312,
+313,7,15,0,0,313,314,7,9,0,0,314,349,7,6,0,0,315,316,7,15,0,0,316,317,7,
+15,0,0,317,349,7,10,0,0,318,319,7,15,0,0,319,320,7,13,0,0,320,349,7,21,0,
+0,321,322,7,13,0,0,322,323,7,8,0,0,323,349,7,9,0,0,324,325,7,13,0,0,325,
+326,7,9,0,0,326,349,7,7,0,0,327,328,7,13,0,0,328,329,7,4,0,0,329,349,7,6,
+0,0,330,331,7,13,0,0,331,332,7,4,0,0,332,349,7,4,0,0,333,334,7,13,0,0,334,
+335,7,4,0,0,335,349,5,49,0,0,336,337,7,13,0,0,337,338,7,15,0,0,338,349,7,
+6,0,0,339,340,7,13,0,0,340,341,7,15,0,0,341,349,7,4,0,0,342,343,7,13,0,0,
+343,344,7,19,0,0,344,349,7,8,0,0,345,346,7,2,0,0,346,347,7,14,0,0,347,349,
+7,15,0,0,348,138,1,0,0,0,348,141,1,0,0,0,348,144,1,0,0,0,348,147,1,0,0,0,
+348,150,1,0,0,0,348,154,1,0,0,0,348,157,1,0,0,0,348,159,1,0,0,0,348,162,
+1,0,0,0,348,166,1,0,0,0,348,169,1,0,0,0,348,173,1,0,0,0,348,176,1,0,0,0,
+348,179,1,0,0,0,348,182,1,0,0,0,348,184,1,0,0,0,348,188,1,0,0,0,348,190,
+1,0,0,0,348,192,1,0,0,0,348,195,1,0,0,0,348,199,1,0,0,0,348,201,1,0,0,0,
+348,203,1,0,0,0,348,206,1,0,0,0,348,209,1,0,0,0,348,213,1,0,0,0,348,216,
+1,0,0,0,348,220,1,0,0,0,348,222,1,0,0,0,348,224,1,0,0,0,348,226,1,0,0,0,
+348,229,1,0,0,0,348,233,1,0,0,0,348,236,1,0,0,0,348,240,1,0,0,0,348,243,
+1,0,0,0,348,246,1,0,0,0,348,248,1,0,0,0,348,252,1,0,0,0,348,256,1,0,0,0,
+348,259,1,0,0,0,348,263,1,0,0,0,348,267,1,0,0,0,348,270,1,0,0,0,348,274,
+1,0,0,0,348,277,1,0,0,0,348,280,1,0,0,0,348,284,1,0,0,0,348,288,1,0,0,0,
+348,290,1,0,0,0,348,293,1,0,0,0,348,296,1,0,0,0,348,300,1,0,0,0,348,303,
+1,0,0,0,348,305,1,0,0,0,348,308,1,0,0,0,348,311,1,0,0,0,348,315,1,0,0,0,
+348,318,1,0,0,0,348,321,1,0,0,0,348,324,1,0,0,0,348,327,1,0,0,0,348,330,
+1,0,0,0,348,333,1,0,0,0,348,336,1,0,0,0,348,339,1,0,0,0,348,342,1,0,0,0,
+348,345,1,0,0,0,349,24,1,0,0,0,350,352,5,46,0,0,351,350,1,0,0,0,351,352,
+1,0,0,0,352,353,1,0,0,0,353,357,7,25,0,0,354,356,7,26,0,0,355,354,1,0,0,
+0,356,359,1,0,0,0,357,355,1,0,0,0,357,358,1,0,0,0,358,26,1,0,0,0,359,357,
+1,0,0,0,360,362,5,36,0,0,361,360,1,0,0,0,361,362,1,0,0,0,362,364,1,0,0,0,
+363,365,7,27,0,0,364,363,1,0,0,0,365,366,1,0,0,0,366,364,1,0,0,0,366,367,
+1,0,0,0,367,369,1,0,0,0,368,370,7,3,0,0,369,368,1,0,0,0,369,370,1,0,0,0,
+370,380,1,0,0,0,371,372,5,48,0,0,372,373,7,2,0,0,373,375,1,0,0,0,374,376,
+7,27,0,0,375,374,1,0,0,0,376,377,1,0,0,0,377,375,1,0,0,0,377,378,1,0,0,0,
+378,380,1,0,0,0,379,361,1,0,0,0,379,371,1,0,0,0,380,28,1,0,0,0,381,385,5,
+59,0,0,382,384,8,28,0,0,383,382,1,0,0,0,384,387,1,0,0,0,385,383,1,0,0,0,
+385,386,1,0,0,0,386,30,1,0,0,0,387,385,1,0,0,0,388,394,5,39,0,0,389,390,
+5,92,0,0,390,393,9,0,0,0,391,393,8,29,0,0,392,389,1,0,0,0,392,391,1,0,0,
+0,393,396,1,0,0,0,394,392,1,0,0,0,394,395,1,0,0,0,395,397,1,0,0,0,396,394,
+1,0,0,0,397,398,5,39,0,0,398,32,1,0,0,0,399,405,5,34,0,0,400,401,5,92,0,
+0,401,404,9,0,0,0,402,404,8,30,0,0,403,400,1,0,0,0,403,402,1,0,0,0,404,407,
+1,0,0,0,405,403,1,0,0,0,405,406,1,0,0,0,406,408,1,0,0,0,407,405,1,0,0,0,
+408,409,5,34,0,0,409,34,1,0,0,0,410,414,5,39,0,0,411,413,8,31,0,0,412,411,
+1,0,0,0,413,416,1,0,0,0,414,412,1,0,0,0,414,415,1,0,0,0,415,417,1,0,0,0,
+416,414,1,0,0,0,417,418,6,17,0,0,418,36,1,0,0,0,419,421,7,28,0,0,420,419,
+1,0,0,0,421,422,1,0,0,0,422,420,1,0,0,0,422,423,1,0,0,0,423,38,1,0,0,0,424,
+425,7,32,0,0,425,426,1,0,0,0,426,427,6,19,0,0,427,40,1,0,0,0,18,0,92,136,
+348,351,357,361,366,369,377,379,385,392,394,403,405,414,422,1,6,0,0];
 
 
 const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
@@ -151,16 +173,16 @@ export default class asmZ80Lexer extends antlr4.Lexer {
     static grammarFileName = "asmZ80.g4";
     static channelNames = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ];
 	static modeNames = [ "DEFAULT_MODE" ];
-	static literalNames = [ null, "':'", "','", "'+'", "'-'", "'*'", "'/'", 
+	static literalNames = [ null, "':'", "','", "'-'", "'+'", "'*'", "'/'", 
                          "'('", "')'", "'$'" ];
 	static symbolicNames = [ null, null, null, null, null, null, null, null, 
                           null, null, "REGISTER", "ASSEMBLER_DIRECTIVE", 
                           "OPCODE", "NAME", "NUMBER", "COMMENT", "STRING", 
-                          "EOL", "WS" ];
+                          "DOUBLE_STRING", "METADATA", "EOL", "WS" ];
 	static ruleNames = [ "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", 
                       "T__7", "T__8", "REGISTER", "ASSEMBLER_DIRECTIVE", 
-                      "OPCODE", "NAME", "NUMBER", "COMMENT", "STRING", "EOL", 
-                      "WS" ];
+                      "OPCODE", "NAME", "NUMBER", "COMMENT", "STRING", "DOUBLE_STRING", 
+                      "METADATA", "EOL", "WS" ];
 
     constructor(input) {
         super(input)
@@ -185,8 +207,10 @@ asmZ80Lexer.NAME = 13;
 asmZ80Lexer.NUMBER = 14;
 asmZ80Lexer.COMMENT = 15;
 asmZ80Lexer.STRING = 16;
-asmZ80Lexer.EOL = 17;
-asmZ80Lexer.WS = 18;
+asmZ80Lexer.DOUBLE_STRING = 17;
+asmZ80Lexer.METADATA = 18;
+asmZ80Lexer.EOL = 19;
+asmZ80Lexer.WS = 20;
 
 
 

package/asm/asmZ80/asmZ80Listener.js

@@ -68,6 +68,15 @@ export default class asmZ80Listener extends antlr4.tree.ParseTreeListener {
 	}
 
 
+	// Enter a parse tree produced by asmZ80Parser#macrocall.
+	enterMacrocall(ctx) {
+	}
+
+	// Exit a parse tree produced by asmZ80Parser#macrocall.
+	exitMacrocall(ctx) {
+	}
+
+
 	// Enter a parse tree produced by asmZ80Parser#lbl.
 	enterLbl(ctx) {
 	}