[gzb2gzbc] Apply workaround for metaborg/nabl#94

MetaBorgCube · Apr 11, 2022 · 80893b5 · 80893b5
1 parent 05260dc
commit 80893b5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/ext/ext.gzb2gzbc/trans/common.str b/ext/ext.gzb2gzbc/trans/common.str
@@ -76,3 +76,18 @@ strategies // is-simple-type :: Type -> id
   + ?TypeBool()
   + ?TypeInt()
   + ?TypeFloat()
+
+strategies // stx-get-scopegraph-data-ext(|Analysis, relation:string) :: Scope -> List(any)
+
+  // Workaround for metaborg/nabl#94, see: https://slde.slack.com/archives/C7254SF60/p1649660409194699
+  stx-get-scopegraph-data-ext(|a, rel) = ?s
+  ; stx-get-scopegraph-data(|a, rel)
+  ; try(
+      ?[]; !s
+      // extract the resource identifier from the scope and drop the "/./" prefix
+    ; where(Scope(string-as-chars(drop(|3)) => resource, id))
+      // attempt to retrieve the analysis state from the extenal scope
+    ; where(a' := <stx-get-ast-analysis> (){TermIndex(resource, -1)})
+      // execute in the external context
+    ; stx-get-scopegraph-data(|a', rel)
+    )
diff --git a/ext/ext.gzb2gzbc/trans/transform-type.str b/ext/ext.gzb2gzbc/trans/transform-type.str
@@ -70,7 +70,7 @@ rules // type-convert(|Analysis) :: TYPE -> Type-C
   type-convert-(|a): ENUM(s, t@INT()) -> TypeEnumInt-C(members)
     with
       members := <
-        stx-get-scopegraph-data(|a, "statics/common!memb")
+        stx-get-scopegraph-data-ext(|a, "statics/common!memb")
       ; filter(?(_, ENUM_V_INT(_)) + ?(_, ENUM_V_STR(_)))
       ; map(
           \((name, _, _), ENUM_V_INT(v)) -> EnumMembInt-C(name, <int-to-string> v)\
@@ -80,7 +80,7 @@ rules // type-convert(|Analysis) :: TYPE -> Type-C
   type-convert-(|a): ENUM(s, t@STRING()) -> TypeEnumString-C(members)
     with
       members := <
-        stx-get-scopegraph-data(|a, "statics/common!memb")
+        stx-get-scopegraph-data-ext(|a, "statics/common!memb")
       ; filter(?(_, ENUM_V_STR(_)))
       ; map(
           \((name, _, _), ENUM_V_STR(v)) -> EnumMembString-C(name, v)\
@@ -146,7 +146,8 @@ strategies // AUX
   */
   tt-scope-query-fields-recursive(|a): s -> <concat> [fields, edges'*]
     with
-      fields := <stx-get-scopegraph-data(|a, "statics/common!field")> s
+      fields := <stx-get-scopegraph-data-ext(|a, "statics/common!field")> s
+      // TODO: maybe edges need a patched version like stx-get-scopegraph-data
     ; edges := <stx-get-scopegraph-edges(|a, "statics/common!B")> s
     ; edges'* := <map(tt-scope-query-fields-recursive(|a))> edges