Merged origin/dev-next into 526-feature-add-full-object-support-and-t…

…ranslation-for-jsts-targets
Kipper-Lang · Jul 12, 2024 · 3c365fc · 3c365fc
1 parent 9c14786
commit 3c365fc
Show file tree

Hide file tree

Showing 83 changed files with 3,146 additions and 2,669 deletions.
diff --git a/kipper/config/src/evaluated-kipper-config-file.ts b/kipper/config/src/evaluated-kipper-config-file.ts
@@ -1,4 +1,4 @@
-import { EvaluatedConfigValue } from "./abstract";
+import type { EvaluatedConfigValue } from "./abstract";
 import type { EvaluatedConfigFile } from "./abstract";
 import type * as semver from "semver";
 import type { CompileConfig, KipperCompileTarget } from "@kipper/core";

diff --git a/kipper/core/KipperParser.g4 b/kipper/core/KipperParser.g4
@@ -85,11 +85,25 @@ parameterDeclaration
     ;
 
 interfaceDeclaration
-	:	'interface' Identifier '{' '}'
-	;
+    :   'interface' declarator '{' interfaceMemberDeclaration* '}'
+    ;
+
+interfaceMemberDeclaration
+    :   interfacePropertyDeclaration
+    |   interfaceMethodDeclaration
+    ;
+
+interfacePropertyDeclaration
+    :   declarator ':' typeSpecifierExpression SemiColon
+    ;
+
+interfaceMethodDeclaration
+    :   declarator '(' parameterList? ')' ':' typeSpecifierExpression SemiColon
+    ;
+
 
 classDeclaration
-	:	'class' Identifier '{' '}'
+	:	'class' declarator '{' '}'
 	;
 
 // -- Statements
@@ -163,6 +177,7 @@ returnStatement
 
 primaryExpression // Primary expressions, which build up the rest of the more complex expressions
     :   tangledPrimaryExpression
+    |   lambdaPrimaryExpression
     |   arrayPrimaryExpression
     |   objectPrimaryExpression
     |   boolPrimaryExpression
@@ -171,10 +186,9 @@ primaryExpression // Primary expressions, which build up the rest of the more co
     |   fStringPrimaryExpression
     |   numberPrimaryExpression
     |	voidOrNullOrUndefinedPrimaryExpression
-    |   lambdaExpression
     ;
 
-lambdaExpression
+lambdaPrimaryExpression
    :   '(' parameterList? ')' ':' typeSpecifierExpression '->' (expression | compoundStatement)
    ;