Merge pull request #446 from mosa11aei/bug/fpp-to-json-pattern-graphs

(fpp-to-json) Bitmap is updated to support patterned connections
nasa · Jun 13, 2024 · adee0c8 · adee0c8
2 parents 9b94479 + 66f5c87
commit adee0c8
Show file tree

Hide file tree

Showing 3 changed files with 3,228 additions and 175 deletions.
diff --git a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
@@ -1918,10 +1918,42 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$228",
   "fields":[{"name":"0bitmap$214"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$229",
+  "fields":[{"name":"0bitmap$213"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$23",
   "fields":[{"name":"0bitmap$20"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$230",
+  "fields":[{"name":"0bitmap$206"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$231",
+  "fields":[{"name":"0bitmap$207"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$232",
+  "fields":[{"name":"0bitmap$208"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$233",
+  "fields":[{"name":"0bitmap$209"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$234",
+  "fields":[{"name":"0bitmap$210"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$235",
+  "fields":[{"name":"0bitmap$211"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$236",
+  "fields":[{"name":"0bitmap$212"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$238",
   "fields":[{"name":"0bitmap$218"}]

diff --git a/compiler/tools/fpp-to-json/test/syntaxOnly.fpp b/compiler/tools/fpp-to-json/test/syntaxOnly.fpp
@@ -68,3 +68,53 @@ module Components {
 
     }
 }
+
+module Main {
+    port P
+
+    passive component C {
+        sync input port pIn: P
+        output port pOut: P
+    }
+
+    instance g: C base id 0x100
+    instance h: C base id 0x200
+    instance i: C base id 0x300
+    instance j: C base id 0x400
+    instance k: C base id 0x500
+    instance l: C base id 0x600
+    instance m: C base id 0x700
+
+    topology b {
+        instance g
+        instance h
+        instance i
+        instance j
+        instance k
+        instance l
+        instance m
+
+        connections A {
+            g.pOut -> h.pIn
+            h.pOut -> i.pIn
+            i.pOut -> j.pIn
+            j.pOut -> k.pIn
+            k.pOut -> l.pIn
+            l.pOut -> m.pIn
+        }
+
+        command connections instance g
+
+        event connections instance h
+
+        param connections instance i
+
+        telemetry connections instance j
+
+        text event connections instance k
+
+        time connections instance l
+
+        health connections instance m 
+    }
+}