Merge pull request #45 from kcl-lang/fix-kcl-java-ast

fix: kcl java ast structures

Author: Peefy

java/src/main/java/com/kcl/ast/CheckExpr.java

@@ -12,8 +12,7 @@
  * }
  * </pre>
  */
-@JsonTypeName("Check")
-public class CheckExpr extends Expr {
+public class CheckExpr {
     @JsonProperty("test")
     private NodeRef<Expr> test;
 

java/src/main/java/com/kcl/ast/Decorator.java

@@ -0,0 +1,48 @@
+package com.kcl.ast;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * Decorator, e.g.
+ *
+ * <pre>
+ * {@code
+ * deprecated(strict=True)
+ * }
+ * </pre>
+ */
+public class Decorator {
+    @JsonProperty("func")
+    private NodeRef<Expr> func;
+
+    @JsonProperty("args")
+    private List<NodeRef<Expr>> args;
+
+    @JsonProperty("keywords")
+    private List<NodeRef<Keyword>> keywords;
+
+    public NodeRef<Expr> getFunc() {
+        return func;
+    }
+
+    public void setFunc(NodeRef<Expr> func) {
+        this.func = func;
+    }
+
+    public List<NodeRef<Expr>> getArgs() {
+        return args;
+    }
+
+    public void setArgs(List<NodeRef<Expr>> args) {
+        this.args = args;
+    }
+
+    public List<NodeRef<Keyword>> getKeywords() {
+        return keywords;
+    }
+
+    public void setKeywords(List<NodeRef<Keyword>> keywords) {
+        this.keywords = keywords;
+    }
+}

java/src/main/java/com/kcl/ast/Expr.java

@@ -22,7 +22,6 @@
         @JsonSubTypes.Type(value = CompClause.class, name = "CompClause"),
         @JsonSubTypes.Type(value = SchemaExpr.class, name = "Schema"),
         @JsonSubTypes.Type(value = ConfigExpr.class, name = "Config"),
-        @JsonSubTypes.Type(value = CheckExpr.class, name = "Check"),
         @JsonSubTypes.Type(value = LambdaExpr.class, name = "Lambda"),
         @JsonSubTypes.Type(value = Subscript.class, name = "Subscript"),
         @JsonSubTypes.Type(value = Compare.class, name = "Compare"),

java/src/main/java/com/kcl/ast/SchemaAttr.java

@@ -33,7 +33,7 @@ public class SchemaAttr extends Stmt {
     private boolean isOptional;
 
     @JsonProperty("decorators")
-    private List<NodeRef<CallExpr>> decorators;
+    private List<NodeRef<Decorator>> decorators;
 
     @JsonProperty("ty")
     private NodeRef<Type> ty;
@@ -78,11 +78,11 @@ public void setOptional(boolean isOptional) {
         this.isOptional = isOptional;
     }
 
-    public List<NodeRef<CallExpr>> getDecorators() {
+    public List<NodeRef<Decorator>> getDecorators() {
         return decorators;
     }
 
-    public void setDecorators(List<NodeRef<CallExpr>> decorators) {
+    public void setDecorators(List<NodeRef<Decorator>> decorators) {
         this.decorators = decorators;
     }
 

java/src/main/java/com/kcl/ast/SchemaStmt.java

@@ -55,7 +55,7 @@ public class SchemaStmt extends Stmt {
     private List<NodeRef<Stmt>> body;
 
     @JsonProperty("decorators")
-    private List<NodeRef<CallExpr>> decorators;
+    private List<NodeRef<Decorator>> decorators;
 
     @JsonProperty("checks")
     private List<NodeRef<CheckExpr>> checks;
@@ -135,11 +135,11 @@ public void setBody(List<NodeRef<Stmt>> body) {
         this.body = body;
     }
 
-    public List<NodeRef<CallExpr>> getDecorators() {
+    public List<NodeRef<Decorator>> getDecorators() {
         return decorators;
     }
 
-    public void setDecorators(List<NodeRef<CallExpr>> decorators) {
+    public void setDecorators(List<NodeRef<Decorator>> decorators) {
         this.decorators = decorators;
     }
 

java/src/main/java/com/kcl/ast/StringLit.java

@@ -18,11 +18,17 @@ public class StringLit extends Expr {
     private String rawValue;
     private String value;
 
+    public StringLit() {
+        this.value = "";
+        this.rawValue = "\"\"";
+        this.isLongString = false;
+    }
+
     // Constructor that replicates the TryFrom implementation in Rust
-    public StringLit(String value) {
+    public StringLit(String value, String rawValue, boolean isLongString) {
         this.value = value;
-        this.rawValue = String.format("%s", value); // Adding quotes, escaping, etc., if needed
-        this.isLongString = false; // Determine based on actual logic (e.g., presence of line breaks)
+        this.rawValue = rawValue;
+        this.isLongString = isLongString;
     }
 
     public boolean isLongString() {