[AnyWeaver] Changes to automatically generated code

specs-feup · Jan 2, 2025 · f9ff1d4 · f9ff1d4
1 parent 523a702
commit f9ff1d4
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 106 deletions.
diff --git a/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/joinpoints/AAny.java b/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/joinpoints/AAny.java
@@ -76,11 +76,11 @@ public final String get_class() {
      * 
      */
     protected enum AnyAttributes {
-        GETVALUE("getValue"),
-        PARENT("parent"),
         AST("ast"),
         CHILDREN("children"),
-        DESCENDANTS("descendants");
+        DESCENDANTS("descendants"),
+        GETVALUE("getValue"),
+        PARENT("parent");
         private String name;
 
         /**

diff --git a/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/joinpoints/AApp.java b/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/joinpoints/AApp.java
@@ -30,7 +30,7 @@ public AJoinPoint addAstImpl(AJoinPoint ast) {
      * Adds an AST to the current program, returns the inserted join point
      * @param ast 
      */
-    public final AJoinPoint addAst(AJoinPoint ast) {
+    public final Object addAst(AJoinPoint ast) {
         try {
         	if(hasListeners()) {
         		eventTrigger().triggerAction(Stage.BEGIN, "addAst", this, Optional.empty(), ast);
@@ -39,7 +39,7 @@ public final AJoinPoint addAst(AJoinPoint ast) {
         	if(hasListeners()) {
         		eventTrigger().triggerAction(Stage.END, "addAst", this, Optional.ofNullable(result), ast);
         	}
-        	return result;
+        	return result!=null?result:getUndefinedValue();
         } catch(Exception e) {
         	throw new ActionException(get_class(), "addAst", e);
         }
@@ -106,11 +106,11 @@ public final String get_class() {
      * 
      */
     protected enum AppAttributes {
-        GETVALUE("getValue"),
-        PARENT("parent"),
         AST("ast"),
         CHILDREN("children"),
-        DESCENDANTS("descendants");
+        DESCENDANTS("descendants"),
+        GETVALUE("getValue"),
+        PARENT("parent");
         private String name;
 
         /**