update ANTLR to 4.10 (mini breaking change)

small changes in testcases
rework decls, still commented-out

Author: sor

Documentation/almost_never_auto.txt

@@ -143,3 +143,9 @@ auto does one good thing for readability, it's very easy to spot variable declar
 Contrary to C++, the initialization with the = sign can now communicate its type to the right side.
 	MyClass myC = new();
 The new can not deduce ...??
+
+
+[magic-return-val=ret]
+[magic-param-val=other]
+[magic-param-ref=other]
+[magic-param-ptr=that]

backend/Grammar/Generated/Myll/MyllLexer.cs

@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     ANTLR Version: 4.9.2
+//     ANTLR Version: 4.10.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from /home/sor/myll/backend/Grammar/MyllParser.g4 by ANTLR 4.9.2
+// Generated from /home/sor/myll/backend/Grammar/MyllParser.g4 by ANTLR 4.10.1
 
 // Unreachable code detected
 #pragma warning disable 0162
@@ -31,7 +31,7 @@ namespace Myll {
 /// of the available methods.
 /// </summary>
 /// <typeparam name="Result">The return type of the visit operation.</typeparam>
-[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.9.2")]
+[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.10.1")]
 [System.Diagnostics.DebuggerNonUserCode]
 [System.CLSCompliant(false)]
 public partial class MyllParserBaseVisitor<Result> : AbstractParseTreeVisitor<Result>, IMyllParserVisitor<Result> {

backend/Grammar/Generated/Myll/MyllParser.cs

@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     ANTLR Version: 4.9.2
+//     ANTLR Version: 4.10.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from /home/sor/myll/backend/Grammar/MyllParser.g4 by ANTLR 4.9.2
+// Generated from /home/sor/myll/backend/Grammar/MyllParser.g4 by ANTLR 4.10.1
 
 // Unreachable code detected
 #pragma warning disable 0162
@@ -29,7 +29,7 @@ namespace Myll {
 /// by <see cref="MyllParser"/>.
 /// </summary>
 /// <typeparam name="Result">The return type of the visit operation.</typeparam>
-[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.9.2")]
+[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.10.1")]
 [System.CLSCompliant(false)]
 public interface IMyllParserVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <summary>

backend/Grammar/Generated/Myll/MyllParserBaseVisitor.cs

@@ -213,7 +213,11 @@ COPY		: 'copy';
 
 ID			: ALPHA_ ALNUM_*;
 
+// The keywords "ret, result, other, that" are not really keywords,
+//	they exist only in special spots and depending on context,
+//	and they are handled by "id"
 NUL			: 'null'|'nullptr'; // nullptr obsolete?
+//CLASS_LIT	: 'this'|'self'|'base'|'super';
 CLASS_LIT	: 'this'|'that'|'self'|'other'|'base'|'super'; // 'ret'?, maybe its not good that other etc are in here
 BOOL_LIT	: 'true'|'false';
 FLOAT_LIT	:	(	DIGIT* '.' DIGIT+ ( [eE] [+-]? DIGIT+ )?

backend/Grammar/Generated/Myll/MyllParserVisitor.cs

@@ -10,6 +10,7 @@ imports		:	IMPORT id (COMMA id)* COMMA? SEMI;
 //defines	:	DEFINITION id (COMMA id)* COMMA? SEMI;
 
 // ONLY refer to levStmt, NOT the inStmt
+// rename to decl?
 levDecl		:	attribBlk	LCURLY	levDecl* RCURLY	# AttribDeclBlock // must be in here, since it MUST have an attrib block
 			|	attribBlk	COLON 					# AttribState     // everything needs an antonym to make this work
 			|	attribBlk?			inDecl			# AttribDecl;
@@ -26,72 +27,108 @@ attribId	:	id | CONST | FALL | THROW | DEFAULT;
 
 /*
 // DON'T refer to inDecl, ONLY refer to levDecl
-// ns, class, enum, func, ppp, c/dtor, alias, static
-inDeclX		:	ALIAS 		declAlias
-			|	ASPECT		declAspect
-			|	CONCEPT		declConcept
-			|	CONVERT		declConvert
-			|	CTOR		declCtor
-			|	DTOR		declDtor
-			|	ENUM		declEnum
-			|	NAMESPACE	declNS
-			|	OPERATOR	declOp
-			|	USING		declUsing
-			|				declFunc
-			|				declStruct
-			|				declVar
+inDecl		:	declNamespace
+			|	declUsing
+			|	declAlias
+			|	declAspect	// TODO
+			|	declConcept	// TODO
+			|	declEnum
+			|	declStruct
+			|	declConvert
+			|	declCtor
+			|	declDtor
+			|	declFunc
+			|	declOp
+			|	declVar
 			;
 
-declNS		:	id (SCOPE id)*
+declNamespace:	NAMESPACE	( defNamespace									);
+declUsing	:	USING		( defUsing SEMI	| LCURLY attrUsing*		RCURLY	);
+declAlias	:	ALIAS		( defAlias SEMI	| LCURLY attrAlias*		RCURLY	);
+declAspect	:	ASPECT		( defAspect										);
+declConcept	:	CONCEPT		( defConcept									);
+declEnum	:	ENUM		( defEnum										);
+declStruct	:	kindOfStruct( defStruct										);
+declConvert	:	CONVERT		( defConvert	| LCURLY attrConvert*	RCURLY	);
+declCtor	:	CTOR		( defCtor		| LCURLY attrCtor*		RCURLY	);
+declDtor	:	DTOR		( defDtor										);
+declFunc	:	kindOfFunc	( defFunc		| LCURLY attrFunc*		RCURLY	);
+declOp		:	OPERATOR	( defOp			| LCURLY attrOp*		RCURLY	);
+declVar		:	kindOfVar	( defVar		| LCURLY attrVar*		RCURLY	);
+
+kindOfStruct:	STRUCT	|	CLASS	|	UNION;
+kindOfFunc	:	FUNC	|	PROC	|	METHOD;
+kindOfVar	:	VAR		|	FIELD	|	CONST	|	LET;
+
+kindOfPassing:	COPY	|	MOVE	|	FORWARD;
+
+attrUsing	:	defUsing	| attribBlk ( defUsing		| LCURLY attrUsing*		RCURLY | COLON );
+attrAlias	:	defAlias	| attribBlk ( defAlias		| LCURLY attrAlias*		RCURLY | COLON );
+attrConvert	:	defConvert	| attribBlk ( defConvert	| LCURLY attrConvert*	RCURLY | COLON );
+attrCtor	:	defCtor		| attribBlk ( defCtor		| LCURLY attrCtor*		RCURLY | COLON );
+attrFunc	:	defFunc		| attribBlk ( defFunc		| LCURLY attrFunc*		RCURLY | COLON );
+attrOp		:	defOp		| attribBlk ( defOp			| LCURLY attrOp*		RCURLY | COLON );
+attrVar		:	defVar		| attribBlk ( defVar		| LCURLY attrVar*		RCURLY | COLON );
+
+//// TODO the 3 kinds of attr each?
+//attrUsing	:	attribBlk?	defUsing;
+//attrAlias	:	attribBlk?	defAlias;
+//attrConvert	:	attribBlk?	defConvert;
+//attrCtor	:	attribBlk?	defCtor;
+//attrFunc	:	attribBlk?	defFunc;
+//attrOp		:	attribBlk?	defOp;
+//attrVar		:	attribBlk?	defVar;
+
+defNamespace:	id (SCOPE id)*
 				(	SEMI
 				|	COLON
 				|	LCURLY	levDecl*		RCURLY);
 
-declUsing	:	typespecsNested						SEMI;
-declAlias	:	id	tplParams?	ASSIGN	typespec	SEMI;	// TODO: needs multiple support
-declAspect	:	id	tplParams?;		// TODO
-declConcept	:	id	tplParams?		// TODO
+defUsing	:	typespecsNested;
+defAlias	:	id	tplParams?	ASSIGN	typespec;	// TODO: needs COMMA multiple support
+
+defAspect	:	id	tplParams?;		// TODO
+defConcept	:	id	tplParams?		// TODO
 				(COLON	typespecsNested)?
 						LCURLY	levDecl*		RCURLY;
-declConvert	:	(	RARROW	to=typespec					// convert -> TYPE	- convert to TYPE	- operator TYPE
-				|			from=typespec	RARROW	id?	// convert TYPE ->	- convert from TYPE	- ctor( TYPE )
-				|	LARROW	from=typespec			id?	// convert <- TYPE	- convert from TYPE	- ctor( TYPE )
-				) funcBody;
-declCtor	:	(	DEFAULT
-				|	(COPY|MOVE|FORWARD)	id?
-				|	CONVERT	LARROW?	typespec id?
-				|	CONVERT			typespec id?	RARROW?
-				|	funcTypeDef?		initList?
-				) funcBody;
-declDtor	:	(LPAREN RPAREN)?	funcBody;
-declEnum	:	id
+defEnum		:	id
 				(COLON	bases=typespecBasic)?	// TODO: enum inheritance
 					LCURLY	idExprs			RCURLY;
-
-declOp		:	(	(COPY|MOVE) ASSIGN	id?	funcBody
-				|	CONVERT 	RARROW?		funcBody
-				|			opDef
-				|	LCURLY	attrOp*		RCURLY);
-
-declFunc	:	v=( FUNC | PROC | METHOD )
-				(			funcDef
-				|	LCURLY	attrFunc*	RCURLY);
-
-declStruct	:	v=( STRUCT | CLASS | UNION )
-				id	tplParams?
+defStruct	:	id	tplParams?
 				(COLON		bases=typespecsNested)?
 				(REQUIRES 	reqs=typespecsNested)?	// TODO
 					LCURLY	levDecl*		RCURLY;
 
-declVar		:	v=( VAR | FIELD | CONST | LET )
-				(			typedIdAcors
-				|	LCURLY	attrVar*		RCURLY);
+defConvert	:	(	RARROW		to=typespec					// convert -> TYPE	- convert to TYPE	- operator TYPE
+				|				from=typespec	id?	RARROW	// convert TYPE ->	- convert from TYPE	- ctor( TYPE ) // not very analogous to the return type definition
+				|	LARROW		from=typespec	id?			// convert <- TYPE	- convert from TYPE	- ctor( TYPE )
+				)
+				funcBody;
+defCtor		:	(	kindOfPassing				id?
+				|	CONVERT	LARROW?	typespec	id?
+				|	CONVERT			typespec	id?	RARROW?
+				|	funcTypeDef?	initList?
+				)
+				funcBody;
+defDtor		:	(LPAREN RPAREN)?
+				funcBody;
+defFunc		:	id			tplParams?	funcTypeDef?
+				(RARROW		typespec)?
+				(REQUIRES	typespecsNested)?	// TODO
+				funcBody;
+defOp		:	(	kindOfPassing	ASSIGN	id?
+				|	CONVERT 		RARROW?
+				|	STRING_LIT		tplParams?	funcTypeDef?
+					(RARROW			typespec)?
+					(REQUIRES		typespecsNested)?	// TODO
+				)
+				funcBody;
+
+defVar		:	typedIdAcors;
+
+
+
 
-// TODO the 3 kinds of attr each
-attrFunc	:	attribBlk?	funcDef;
-attrOp		:	attribBlk?	opDef;
-attrVar		:	attribBlk?	typedIdAcors;
-*/
 /*
 opDef		:	STRING_LIT	tplParams?	funcTypeDef?
 				(RARROW		typespec)?

backend/Grammar/MyllLexer.g4

@@ -19,7 +19,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Antlr4.Runtime.Standard" Version="4.9.3" />
+	  <PackageReference Include="Antlr4.Runtime.Standard" Version="4.10.1" />
 	</ItemGroup>
 
 	<ItemGroup>

backend/Grammar/MyllParser.g4

@@ -97,7 +97,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+	  <PackageReference Include="CommandLineParser" Version="2.9.1" />
 	</ItemGroup>
 
 </Project>

backend/backend.csproj

@@ -19,7 +19,7 @@ class GameOfLife
 [pub]:
 	ctor()
 	{
-		var Map2D& dstMap = doubleBufferedMap[currentIndex];
+		var Map2D & dstMap = doubleBufferedMap[currentIndex];
 
 		do sizeY times y
 		{
@@ -55,7 +55,7 @@ class GameOfLife
 				else
 				{
 					const bool aliveSelf = srcMap[y][x] == 'o';
-					const int  aliveNB   =
+					const int  aliveNeighborCount =
 						  (srcMap[y-1][x-1] == 'o')
 						+ (srcMap[y-1][x  ] == 'o')
 						+ (srcMap[y-1][x+1] == 'o')
@@ -65,8 +65,8 @@ class GameOfLife
 						+ (srcMap[y+1][x  ] == 'o')
 						+ (srcMap[y+1][x+1] == 'o');
 					const bool aliveDst = aliveSelf
-						? (aliveNB == 2 || aliveNB == 3)
-						: (aliveNB == 3);
+						? (aliveNeighborCount == 2 || aliveNeighborCount == 3)
+						: (aliveNeighborCount == 3);
 
 					dstMap[y][x] = aliveDst ? 'o' : ' ';
 				}

frontend/frontend.csproj

@@ -288,31 +288,36 @@ namespace ctor_fun {
 	class Test {
 		field f32 f;
 	[pub]:
-		ctor()			{}
-		ctor			{}	// same as above
-		ctor default	{}	// same as above
-	//	ctor( default )	{}	// same as above
+		ctor()	{}
+		ctor	{}	// same as above
+		ctor;		// defaulted default ctor
 
 		[moep]{
+			method isEmpty() -> bool => _size == 0;
 			ctor{}
 		}
 
 		ctor( const Test & other )	{ f = other.f;	}
 		ctor copy					{ f = other.f;	}	// same as above
-		copy ctor o					{ f = o.f;		}	// same as above
+		ctor copy o					{ f = o.f;		}	// same as above
 
 		[implicit] ctor( bool b )	{ f = b ? 1 : 2; }
 		ctor convert bool b			{ f = b ? 1 : 2; }		// same as above
-		convert ctor bool			{ f = other ? 1 : 2; }	// same as above
-	//	ctor convert <- bool		{ f = other ? 1 : 2; }	// same as above
-	//	convert ctor <- bool b		{ f = b ? 1 : 2; }		// same as above
+		ctor convert bool			{ f = other ? 1 : 2; }	// same as above
+		ctor convert <- bool		{ f = other ? 1 : 2; }	// same as above
+		ctor convert bool ->		{ f = other ? 1 : 2; }	// same as above
+		convert <- bool b			{ f = b ? 1 : 2; }		// same as above
+		convert bool b ->			{ f = b ? 1 : 2; }		// same as above
 
 		dtor()	{}
 		dtor	{}	// same as above
+		dtor;		// defaulted dtor
 
 		operator "=" ( const Test & other )	{ f = other.f; }
-		operator copy "="					{ f = other.f; } // same as above
-		copy operator "="					{ f = other.f; } // same as above
+		operator copy=						{ f = other.f; } // same as above
+
+		operator "=" ( Test && other )		{ f = other.f; }
+		operator move=						{ f = other.f; } // same as above
 	//	operator "=" copy					{ f = other.f; } // same as above
 	}
 }