Add support for Kotlin files

.classpath

@@ -62,6 +62,13 @@
 	<classpathentry kind="lib" path="lib/datagen/org.eclipse.php.core.source_4.3.1.201703301037.jar"/>
 	<classpathentry kind="lib" path="lib/datagen/org.eclipse.text-3.5.101-sources.jar"/>
 	<classpathentry kind="lib" path="lib/datagen/org.eclipse.text-3.5.101.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/annotations-21.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/kotlin-compiler-1.5.20.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/kotlin-reflect-1.5.20.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/kotlin-script-runtime-1.5.20.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/kotlin-stdlib-1.5.20.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/openapi-7.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/datagen-kotlin/trove4j-1.0.20200330.jar"/>
 	<classpathentry kind="lib" path="lib/datagen/protobuf-java-2.5.0.jar"/>
 	<classpathentry kind="lib" path="lib/datagen/slf4j-api-1.4.3.jar"/>
 	<classpathentry kind="lib" path="lib/datagen/slf4j-log4j12-1.4.3.jar"/>

.dir-locals.el

@@ -0,0 +1,14 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((java-mode . ((tab-width . 8)
+               (c-basic-offset . 8)
+               (indent-tabs-mode . t)
+               (ws-trim-mode . t)
+               (eval . (progn
+                         (c-set-offset 'arglist-cont-nonempty '++)
+                         (c-set-offset 'case-label '+)))))
+ (protobuf-mode . ((tab-width . 8)
+                   (c-basic-offset . 8)
+                   (indent-tabs-mode . t)
+                   (ws-trim-mode . t))))

.github/workflows/ant.yml

@@ -90,6 +90,19 @@ jobs:
     - name: Run unit tests - datagen - Java
       run: ant -noinput -buildfile build.xml -Dprotobuf.uptodate=true test-datagen-java
 
+  test-datagen-kotlin:
+    needs: compile
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+    - name: Run unit tests - datagen - Kotlin
+      run: ant -noinput -buildfile build.xml -Dprotobuf.uptodate=true test-datagen-kotlin
+
   test-datagen-js:
     needs: compile
     runs-on: ubuntu-latest

.gitignore

@@ -8,3 +8,4 @@
 /junitvmwatcher*.properties
 .vscode/
 /src/antlr/.antlr
+.*.swp

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

boa.bat

@@ -1,4 +1,4 @@
 @ECHO OFF
 
-"%JAVA_HOME%"\bin\java -cp .;"%~dp0dist\boa-compiler.jar";"%~dp0lib\*";"%~dp0lib\evaluator\*";"%~dp0lib\datagen\*";"%~dp0compile" boa.BoaMain %*
+"%JAVA_HOME%"\bin\java -cp .;"%~dp0dist\boa-compiler.jar";"%~dp0lib\*";"%~dp0lib\evaluator\*";"%~dp0lib\datagen\*";"%~dp0lib\datagen-kotlin\*";"%~dp0compile" boa.BoaMain %*
 pause

boa.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
 
-java -cp ".:$BASEDIR/dist/boa-compiler.jar:$BASEDIR/lib/*:$BASEDIR/lib/evaluator/*:$BASEDIR/lib/datagen/*:$BASEDIR/compile" boa.BoaMain $*
+java -cp ".:$BASEDIR/dist/boa-compiler.jar:$BASEDIR/lib/*:$BASEDIR/lib/evaluator/*:$BASEDIR/lib/datagen/*:$BASEDIR/lib/datagen-kotlin/*:$BASEDIR/compile" boa.BoaMain $*

build.xml

@@ -261,6 +261,21 @@
 		<fail message="Test failure detected." if="test.failed" />
 	</target>
 
+	<target name="test-datagen-kotlin" depends="-compile-tests" description="Run Kotlin datagen unit tests.">
+		<junit fork="yes" haltonfailure="no" failureproperty="test.failed">
+			<classpath refid="test.class.path" />
+			<batchtest>
+				<formatter type="plain" usefile="false" />
+				<fileset dir="build/tests">
+					<include name="boa/test/datagen/kotlin/Test*.class" />
+					<exclude name="**/*$*.class" />
+				</fileset>
+			</batchtest>
+		</junit>
+		<delete file="SecurityAuth.audit" />
+		<fail message="Test failure detected." if="test.failed" />
+	</target>
+
 	<target name="test-datagen-js" depends="-compile-tests" description="Run JavaScript datagen unit tests.">
 		<junit fork="yes" haltonfailure="no" failureproperty="test.failed">
 			<classpath refid="test.class.path" />
@@ -447,20 +462,36 @@
 
 
 	<!-- debug targets -->
-	<target name="java-to-boa" depends="-compile-tests" description="Convert Java code to Boa AST.">
+	<target name="java-to-boa" depends="-compile-tests" description="Convert Java code to Boa AST (set -Djava.code).">
 		<java classname="boa.test.datagen.java.JavaToBoa" fork="true" failonerror="true">
 			<classpath refid="test.class.path" />
 			<arg value="${java.code}" />
 		</java>
 	</target>
 
-	<target name="dump-java" depends="-compile-tests" description="Parse and dump Java AST.">
+	<target name="dump-java" depends="-compile-tests" description="Parse and dump Java AST (set -Djava.code).">
 		<java classname="boa.test.datagen.java.DumpJava" fork="true" failonerror="true">
 			<classpath refid="test.class.path" />
 			<arg value="${java.code}" />
 		</java>
 	</target>
 
+	<target name="kotlin-to-boa" depends="-compile-tests" description="Convert Kotlin code to Boa AST (set -Dkotlin.code, -Dkotlin.name for filename optional).">
+		<java classname="boa.test.datagen.kotlin.KotlinToBoa" fork="true" failonerror="true">
+			<classpath refid="test.class.path" />
+			<arg value="${kotlin.code}" />
+			<arg value="${kotlin.name}" />
+		</java>
+	</target>
+
+	<target name="dump-kotlin" depends="-compile-tests" description="Parse and dump Kotlin AST (set -Dkotlin.code, -Dkotlin.name for filename optional).">
+		<java classname="boa.test.datagen.kotlin.DumpKotlin" fork="true" failonerror="true">
+			<classpath refid="test.class.path" />
+			<arg value="${kotlin.code}" />
+			<arg value="${kotlin.name}" />
+		</java>
+	</target>
+
 
 	<!-- style checking -->
 	<target name="checkstyle">
@@ -473,10 +504,47 @@
 
 
 	<!-- packaging -->
+	<target name="git.revision" description="Store git revision in ${repository.version}">
+		<exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
+			<arg value="log" />
+			<arg value="-1" />
+			<arg value="--pretty=format:%H" />
+		</exec>
+		<condition property="repository.version" value="${git.revision}" else="unknown">
+			<and>
+				<isset property="git.revision"/>
+				<length string="${git.revision}" trim="yes" length="0" when="greater" />
+			</and>
+		</condition>
+	</target>
+
+	<target name="git.branch" description="Store git branch in ${repository.branch}">
+		<exec executable="git" outputproperty="git.branch" failifexecutionfails="false" errorproperty="">
+			<arg value="branch" />
+			<arg value="--show-current" />
+		</exec>
+		<condition property="repository.branch" value="${git.branch}" else="unknown">
+			<and>
+				<isset property="git.branch"/>
+				<length string="${git.branch}" trim="yes" length="0" when="greater" />
+			</and>
+		</condition>
+	</target>
+
 	<target name="package" depends="package-runtime,package-compiler" description="Package both the compiler and runtime JARs."/>
 
-	<target name="package-runtime" depends="compile" description="Package the runtime JAR.">
+	<target name="package-runtime" depends="compile,git.branch,git.revision" description="Package the runtime JAR.">
+		<tstamp>
+			<format property="time.stamp" pattern="yyyy-MM-dd_HH:mm:ss"/>
+		</tstamp>
 		<jar destfile="dist/boa-runtime.jar">
+			<manifest>
+				<section name="boa">
+					<attribute name="Boa-Compiler-Branch" value="${repository.branch}" />
+					<attribute name="Boa-Compiler-Commit" value="${repository.version}" />
+					<attribute name="Boa-Compiler-CompiledDate" value="${time.stamp}" />
+				</section>
+			</manifest>
 			<fileset dir="build/classes">
 				<patternset>
 					<include name="boa/" />
@@ -487,13 +555,28 @@
 					<exclude name="**/boa/types/Boa*" />
 				</patternset>
 			</fileset>
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/annotations-21.0.1.jar" />
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/kotlin-reflect-1.5.20.jar" />
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/kotlin-stdlib-1.5.20.jar" />
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/trove4j-1.0.20200330.jar" />
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/kotlin-compiler-1.5.20.jar" />
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/kotlin-script-runtime-1.5.20.jar" />
+			<zipfileset excludes="META-INF/" src="lib/datagen-kotlin/openapi-7.0.3.jar" />
 		</jar>
 	</target>
 
-	<target name="package-compiler" depends="compile" description="Package the compiler JAR.">
+	<target name="package-compiler" depends="compile,git.branch,git.revision" description="Package the compiler JAR.">
+		<tstamp>
+			<format property="time.stamp" pattern="yyyy-MM-dd_HH:mm:ss"/>
+		</tstamp>
 		<jar destfile="dist/boa-compiler.jar">
 			<manifest>
 				<attribute name="Main-Class" value="boa.BoaMain" />
+				<section name="boa">
+					<attribute name="Boa-Compiler-Branch" value="${repository.branch}" />
+					<attribute name="Boa-Compiler-Commit" value="${repository.version}" />
+					<attribute name="Boa-Compiler-CompiledDate" value="${time.stamp}" />
+				</section>
 			</manifest>
 			<fileset dir="build/classes" />
 			<fileset dir="conf" />

evaluate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ "$#" -lt 2 ]; then
     echo "Usage: $0 file.boa output-dir/ [options]"