Merge branch 'development' of github.com:ortus-solutions-private/boxl…

…ang into development
ortus-boxlang · Nov 28, 2023 · 54d86f0 · 54d86f0
2 parents 6f5abd3 + 4e4f4ca
commit 54d86f0
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 328 deletions.
diff --git a/grapher/data/.gitignore b/grapher/data/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in the folder
+*
+
+# But don't ignore this file
+!.gitignore
diff --git a/grapher/data/ast.json b/grapher/data/ast.json
diff --git a/grapher/data/simple.json b/grapher/data/simple.json
diff --git a/src/main/java/ortus/boxlang/ast/Node.java b/src/main/java/ortus/boxlang/ast/Node.java
@@ -134,10 +134,10 @@ public List<Node> walkAncestors() {
 	public Map<String, Object> toMap() {
 		Map<String, Object> map = new LinkedHashMap<String, Object>();
 
-		map.put( "ASTType", getClass().getSimpleName() );
-		map.put( "position", position.toMap() );
+		map.put( "ASTType", getClass().getSimpleName() );	
 		map.put( "ASTPackage", getClass().getPackageName() );
 		map.put( "sourceText", sourceText );
+		map.put( "position", position.toMap() );
 
 		// I'm not sure if children is used at all right now
 		// map.put( "children", children.stream().map( Node::toMap ).toList() );