Merge pull request #106 from ortus-boxlang/development

1.0.0-Beta13

Author: lmajano

build.gradle

@@ -98,7 +98,7 @@ dependencies {
 	testImplementation "org.wiremock:wiremock:3.9.1"
 	// https://mvnrepository.com/artifact/org.apache.derby/derby
 	testImplementation 'org.apache.derby:derby:10.17.1.0'
-	testImplementation 'io.undertow:undertow-core:2.3.16.Final'
+	testImplementation 'io.undertow:undertow-core:2.3.17.Final'
 
 	// Antlr
 	antlr "org.antlr:antlr4:$antlrVersion"
@@ -107,9 +107,9 @@ dependencies {
 	// https://mvnrepository.com/artifact/commons-io/commons-io
 	implementation "commons-io:commons-io:2.16.1"
 	// https://mvnrepository.com/artifact/com.github.javaparser/javaparser-symbol-solver-core
-	implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.26.1'
+	implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.26.2'
 	// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-	implementation 'org.apache.commons:commons-lang3:3.16.0'
+	implementation 'org.apache.commons:commons-lang3:3.17.0'
 	// https://mvnrepository.com/artifact/org.apache.commons/commons-text
 	// Many of these classes ( e.g. StringEscapeUtils ) are currently deprecated in commons-lang and others will be moved in the future
 	implementation 'org.apache.commons:commons-text:1.12.0'

gradle.properties

@@ -1,4 +1,4 @@
-#Fri Aug 30 16:29:10 UTC 2024
+#Fri Aug 30 16:46:29 UTC 2024
 antlrVersion=4.13.1
 jdkVersion=21
-version=1.0.0-beta12
+version=1.0.0-beta13

src/main/antlr/BoxScriptGrammar.g4

@@ -407,7 +407,7 @@ rethrow: RETHROW
     ;
 
 // throw Exception;
-throw: THROW expression
+throw: { isThrow(_input) }? THROW expression
     ;
 
 /*

src/main/antlr/CFScriptGrammar.g4

@@ -392,7 +392,7 @@ rethrow: RETHROW
     ;
 
 // throw Exception;
-throw: THROW expression
+throw: { isThrow(_input) }? THROW expression
     ;
 
 /*

src/main/antlr/DocLexer.g4

@@ -1,15 +1,11 @@
-
-
-
 lexer grammar DocLexer;
 
-NAME: [a-zA-Z.0-9]+;
+NAME: [a-zA-Z.0-9:]+;
 
 NEWLINE:
-    '\n' (SPACE? (STAR {_input.LA(1) != '/'}?)+)?
-    | '\r\n' (SPACE? (STAR {_input.LA(1) != '/'}?)+)?
-    | '\r' (SPACE? (STAR {_input.LA(1) != '/'}?)+)?
-;
+	'\n' (SPACE? (STAR {_input.LA(1) != '/'}?)+)?
+	| '\r\n' (SPACE? (STAR {_input.LA(1) != '/'}?)+)?
+	| '\r' (SPACE? (STAR {_input.LA(1) != '/'}?)+)?;
 
 SPACE: (' ' | '\t')+;
 

src/main/java/ortus/boxlang/compiler/asmboxpiler/AsmHelper.java

@@ -282,6 +282,7 @@ public static void methodWithContextAndClassLocator( ClassNode classNode,
 	    Type returnType,
 	    boolean isStatic,
 	    Transpiler transpiler,
+	    boolean implicityReturnNull,
 	    Supplier<List<AbstractInsnNode>> supplier ) {
 		MethodContextTracker tracker = new MethodContextTracker( isStatic );
 		transpiler.addMethodContextTracker( tracker );
@@ -302,6 +303,7 @@ public static void methodWithContextAndClassLocator( ClassNode classNode,
 		    Type.getMethodDescriptor( Type.getType( ClassLocator.class ) ),
 		    false );
 		tracker.storeNewVariable( Opcodes.ASTORE ).nodes().forEach( ( node ) -> node.accept( methodVisitor ) );
+
 		// methodVisitor.visitVarInsn( Opcodes.ASTORE, isStatic ? 1 : 2 );
 		List<AbstractInsnNode> nodes = supplier.get();
 		if ( !nodes.isEmpty() && ( nodes.get( nodes.size() - 1 ).getOpcode() == Opcodes.POP || nodes.get( nodes.size() - 1 ).getOpcode() == Opcodes.POP2 ) ) {
@@ -310,6 +312,11 @@ public static void methodWithContextAndClassLocator( ClassNode classNode,
 			nodes.forEach( node -> node.accept( methodVisitor ) );
 		}
 
+		if ( implicityReturnNull ) {
+			// push a null onto the stack so that we can return it if there isn't an explicity return
+			new InsnNode( Opcodes.ACONST_NULL ).accept( methodVisitor );
+		}
+
 		methodVisitor.visitInsn( returnType.getOpcode( Opcodes.IRETURN ) );
 		methodVisitor.visitMaxs( 0, 0 );
 

src/main/java/ortus/boxlang/compiler/asmboxpiler/AsmTranspiler.java

@@ -262,6 +262,7 @@ public ClassNode transpile( BoxScript boxScript ) throws BoxRuntimeException {
 		    returnType,
 		    false,
 		    this,
+		    false,
 		    () -> AsmHelper.transformBodyExpressions( this, boxScript.getStatements(), TransformerContext.NONE,
 		        returnType == Type.VOID_TYPE ? ReturnValueContext.EMPTY : ReturnValueContext.VALUE_OR_NULL )
 		);
@@ -626,12 +627,12 @@ public ClassNode transpile( BoxClass boxClass ) throws BoxRuntimeException {
 		    Type.getType( Key.class ), Type.getType( Map.class ), Type.getType( Boolean.class ) );
 		AsmHelper.boxClassSupport( classNode, "registerInterface", Type.VOID_TYPE, Type.getType( BoxInterface.class ) );
 
-		AsmHelper.methodWithContextAndClassLocator( classNode, "_pseudoConstructor", Type.getType( IBoxContext.class ), Type.VOID_TYPE, false, this,
+		AsmHelper.methodWithContextAndClassLocator( classNode, "_pseudoConstructor", Type.getType( IBoxContext.class ), Type.VOID_TYPE, false, this, true,
 		    () -> boxClass.getBody().stream().flatMap( statement -> transform( statement, TransformerContext.NONE, ReturnValueContext.EMPTY ).stream() )
 		        .toList()
 		);
 
-		AsmHelper.methodWithContextAndClassLocator( classNode, "staticInitializer", Type.getType( IBoxContext.class ), Type.VOID_TYPE, true, this,
+		AsmHelper.methodWithContextAndClassLocator( classNode, "staticInitializer", Type.getType( IBoxContext.class ), Type.VOID_TYPE, true, this, true,
 		    List::of
 		);
 

src/main/java/ortus/boxlang/compiler/asmboxpiler/transformer/expression/BoxClosureTransformer.java

@@ -140,7 +140,7 @@ public List<AbstractInsnNode> transform( BoxNode node, TransformerContext contex
 		    Type.getType( BoxSourceType.class ) );
 
 		AsmHelper.methodWithContextAndClassLocator( classNode, "_invoke", Type.getType( FunctionBoxContext.class ), Type.getType( Object.class ), false,
-		    transpiler,
+		    transpiler, false,
 		    () -> boxClosure.getBody().getChildren().stream().flatMap( statement -> transpiler.transform( statement, TransformerContext.NONE ).stream() )
 		        .toList() );
 

src/main/java/ortus/boxlang/compiler/asmboxpiler/transformer/expression/BoxLambdaTransformer.java

@@ -117,7 +117,7 @@ public List<AbstractInsnNode> transform( BoxNode node, TransformerContext contex
 		    Type.getType( BoxSourceType.class ) );
 
 		AsmHelper.methodWithContextAndClassLocator( classNode, "_invoke", Type.getType( FunctionBoxContext.class ), Type.getType( Object.class ), false,
-		    transpiler,
+		    transpiler, false,
 		    () -> boxLambda.getBody().getChildren().stream().flatMap( statement -> transpiler.transform( statement, TransformerContext.NONE ).stream() )
 		        .toList() );
 

src/main/java/ortus/boxlang/compiler/asmboxpiler/transformer/expression/BoxMethodInvocationTransformer.java

@@ -54,7 +54,7 @@ public List<AbstractInsnNode> transform( BoxNode node, TransformerContext contex
 
 		transpiler.getCurrentMethodContextTracker().ifPresent( tracker -> nodes.addAll( tracker.loadCurrentContext() ) );
 
-		nodes.addAll( transpiler.transform( invocation.getObj(), context, returnContext ) );
+		nodes.addAll( transpiler.transform( invocation.getObj(), context, ReturnValueContext.VALUE ) );
 
 		if ( invocation.getUsedDotAccess() ) {
 			nodes.addAll( transpiler.createKey( ( ( BoxIdentifier ) invocation.getName() ).getName() ) );