From 0bf00381120145f0595cefd89a3e3e27d1aa0203 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sun, 2 Feb 2025 17:21:07 +0100 Subject: [PATCH] Fixed next.xsd and next.xml. Several Java classes were added --- next.xml | 263 ++++++++++-------- next.xsd | 51 +++- .../java/com/openeggbert/next/ast/Access.java | 5 + .../com/openeggbert/next/ast/Assignment.java | 9 + .../openeggbert/next/ast/BinaryOperation.java | 4 + .../java/com/openeggbert/next/ast/Body.java | 11 + .../java/com/openeggbert/next/ast/Else.java | 11 + .../com/openeggbert/next/ast/Expression.java | 4 + .../java/com/openeggbert/next/ast/Getter.java | 9 + .../java/com/openeggbert/next/ast/If.java | 9 + .../openeggbert/next/ast/PrimitiveType.java | 5 + .../com/openeggbert/next/ast/Property.java | 13 + .../java/com/openeggbert/next/ast/Setter.java | 9 + .../com/openeggbert/next/ast/Statement.java | 4 + .../openeggbert/next/ast/TernaryOperator.java | 4 + .../com/openeggbert/next/ast/TypeCast.java | 4 + .../java/com/openeggbert/next/ast/Value.java | 5 + .../next/ast/VariableDeclaration.java | 9 + 18 files changed, 306 insertions(+), 123 deletions(-) create mode 100644 src/main/java/com/openeggbert/next/ast/Access.java create mode 100644 src/main/java/com/openeggbert/next/ast/Assignment.java create mode 100644 src/main/java/com/openeggbert/next/ast/BinaryOperation.java create mode 100644 src/main/java/com/openeggbert/next/ast/Body.java create mode 100644 src/main/java/com/openeggbert/next/ast/Else.java create mode 100644 src/main/java/com/openeggbert/next/ast/Expression.java create mode 100644 src/main/java/com/openeggbert/next/ast/Getter.java create mode 100644 src/main/java/com/openeggbert/next/ast/If.java create mode 100644 src/main/java/com/openeggbert/next/ast/PrimitiveType.java create mode 100644 src/main/java/com/openeggbert/next/ast/Property.java create mode 100644 src/main/java/com/openeggbert/next/ast/Setter.java create mode 100644 src/main/java/com/openeggbert/next/ast/Statement.java create mode 100644 src/main/java/com/openeggbert/next/ast/TernaryOperator.java create mode 100644 src/main/java/com/openeggbert/next/ast/TypeCast.java create mode 100644 src/main/java/com/openeggbert/next/ast/Value.java create mode 100644 src/main/java/com/openeggbert/next/ast/VariableDeclaration.java diff --git a/next.xml b/next.xml index 3dd6831..acceb61 100644 --- a/next.xml +++ b/next.xml @@ -1,140 +1,175 @@ - + + + - - - + + + - - Env.PLATFORM - Platform.Android - - - screenHeight - 480 - + + + Env.PLATFORM + Platform.Android + + + + + screenHeight + 480 + + - - screenWidth - - - screenHeight - - 640f - 480f + + + + screenWidth + + + screenHeight + + + 640f + 480f + + - - - + + + + - - screenWidth - 0.0 - - - screenHeight - 0.0 - + + + screenWidth + 0.0 + + + + + screenHeight + 0.0 + + - - - - - test - - - - 11 - - 1 - 2 - - - - - - - - screenWidth - screenHeight - - 1.3333333333333333 - - - - - num3 - 640.0 - - - num4 - - - 640.0 - - screenHeight - screenWidth + + + + + + test + + + + + 1 + 1 - - - - - - - - - num3 - - - 480.0 + + 1 + 2 + + + + + + + screenWidth screenHeight - - - - - num4 - 480.0 - - - - - result.LeftX - 0 - - - result.RightX - - - num3 - - - - - result.TopY - 0 - - - result.BottomY - - - num4 - - - + + 1.3333333333333333 + + + + + + num3 + 640.0 + + + num4 + + + 640.0 + + + screenHeight + screenWidth + + + + + + + + + + + + num3 + + + 480.0 + + + screenWidth + screenHeight + + + + + + + num4 + 480.0 + + + + + + + + + result.LeftX + 0 + + + result.RightX + + + num3 + + + + + result.TopY + 0 + + + result.BottomY + + + num4 + + + + diff --git a/next.xsd b/next.xsd index 0f5c600..b321852 100644 --- a/next.xsd +++ b/next.xsd @@ -3,7 +3,8 @@ - + + @@ -11,12 +12,19 @@ + + + + + + + @@ -27,7 +35,6 @@ - @@ -43,6 +50,7 @@ + @@ -61,7 +69,7 @@ - + @@ -75,10 +83,26 @@ + + + + + + + + + + + + + + + + - - + + @@ -90,11 +114,20 @@ - + + + + + + + + + + - - - + + + diff --git a/src/main/java/com/openeggbert/next/ast/Access.java b/src/main/java/com/openeggbert/next/ast/Access.java new file mode 100644 index 0000000..c714630 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Access.java @@ -0,0 +1,5 @@ +package com.openeggbert.next.ast; + +public enum Access { + PUBLIC, PROTECTED, PRIVATE, PACKAGE; +} diff --git a/src/main/java/com/openeggbert/next/ast/Assignment.java b/src/main/java/com/openeggbert/next/ast/Assignment.java new file mode 100644 index 0000000..3fb65a4 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Assignment.java @@ -0,0 +1,9 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +@Data +public class Assignment extends Statement { + private String left; + private Expression right; +} diff --git a/src/main/java/com/openeggbert/next/ast/BinaryOperation.java b/src/main/java/com/openeggbert/next/ast/BinaryOperation.java new file mode 100644 index 0000000..ae125c3 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/BinaryOperation.java @@ -0,0 +1,4 @@ +package com.openeggbert.next.ast; + +public class BinaryOperation extends Expression{ +} diff --git a/src/main/java/com/openeggbert/next/ast/Body.java b/src/main/java/com/openeggbert/next/ast/Body.java new file mode 100644 index 0000000..4783998 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Body.java @@ -0,0 +1,11 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +import java.util.List; + +@Data +public class Body { + private List statements; + +} diff --git a/src/main/java/com/openeggbert/next/ast/Else.java b/src/main/java/com/openeggbert/next/ast/Else.java new file mode 100644 index 0000000..6379610 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Else.java @@ -0,0 +1,11 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +import java.util.List; + +@Data +public class Else { + private Body body; + +} diff --git a/src/main/java/com/openeggbert/next/ast/Expression.java b/src/main/java/com/openeggbert/next/ast/Expression.java new file mode 100644 index 0000000..f294a2f --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Expression.java @@ -0,0 +1,4 @@ +package com.openeggbert.next.ast; + +public class Expression { +} diff --git a/src/main/java/com/openeggbert/next/ast/Getter.java b/src/main/java/com/openeggbert/next/ast/Getter.java new file mode 100644 index 0000000..7dbae5d --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Getter.java @@ -0,0 +1,9 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +@Data +public class Getter { + private Body body; + +} diff --git a/src/main/java/com/openeggbert/next/ast/If.java b/src/main/java/com/openeggbert/next/ast/If.java new file mode 100644 index 0000000..94f009e --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/If.java @@ -0,0 +1,9 @@ +package com.openeggbert.next.ast; + +import java.util.concurrent.locks.Condition; + +public class If extends Statement { + private Condition condition; + private Body body; + private Else elseBranch; +} diff --git a/src/main/java/com/openeggbert/next/ast/PrimitiveType.java b/src/main/java/com/openeggbert/next/ast/PrimitiveType.java new file mode 100644 index 0000000..80272b1 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/PrimitiveType.java @@ -0,0 +1,5 @@ +package com.openeggbert.next.ast; + +public enum PrimitiveType { + INT, LONG, FLOAT, DOUBLE, STRING +} diff --git a/src/main/java/com/openeggbert/next/ast/Property.java b/src/main/java/com/openeggbert/next/ast/Property.java new file mode 100644 index 0000000..c4f5da9 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Property.java @@ -0,0 +1,13 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +@Data +public class Property { + private String name; + private Access access; + private String returnType; + private Getter getter; + private Setter setter; + +} diff --git a/src/main/java/com/openeggbert/next/ast/Setter.java b/src/main/java/com/openeggbert/next/ast/Setter.java new file mode 100644 index 0000000..4401e2c --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Setter.java @@ -0,0 +1,9 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +@Data +public class Setter { + private Body body; + +} diff --git a/src/main/java/com/openeggbert/next/ast/Statement.java b/src/main/java/com/openeggbert/next/ast/Statement.java new file mode 100644 index 0000000..8e3eec3 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Statement.java @@ -0,0 +1,4 @@ +package com.openeggbert.next.ast; + +public class Statement { +} diff --git a/src/main/java/com/openeggbert/next/ast/TernaryOperator.java b/src/main/java/com/openeggbert/next/ast/TernaryOperator.java new file mode 100644 index 0000000..b74c098 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/TernaryOperator.java @@ -0,0 +1,4 @@ +package com.openeggbert.next.ast; + +public class TernaryOperator extends Expression{ +} diff --git a/src/main/java/com/openeggbert/next/ast/TypeCast.java b/src/main/java/com/openeggbert/next/ast/TypeCast.java new file mode 100644 index 0000000..5461b3f --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/TypeCast.java @@ -0,0 +1,4 @@ +package com.openeggbert.next.ast; + +public class TypeCast extends Expression{ +} diff --git a/src/main/java/com/openeggbert/next/ast/Value.java b/src/main/java/com/openeggbert/next/ast/Value.java new file mode 100644 index 0000000..7fca9a1 --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/Value.java @@ -0,0 +1,5 @@ +package com.openeggbert.next.ast; + +public class Value extends Expression{ + private String string; +} diff --git a/src/main/java/com/openeggbert/next/ast/VariableDeclaration.java b/src/main/java/com/openeggbert/next/ast/VariableDeclaration.java new file mode 100644 index 0000000..b4718ee --- /dev/null +++ b/src/main/java/com/openeggbert/next/ast/VariableDeclaration.java @@ -0,0 +1,9 @@ +package com.openeggbert.next.ast; + +import lombok.Data; + +@Data +public class VariableDeclaration extends Statement { + private String name; + private String initialization; +}