support for resolving arbitrary names independent of existing actual

references
metaborg · Jun 11, 2014 · 1ff23d9 · 1ff23d9
1 parent ebc178f
commit 1ff23d9
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 159 deletions.
diff --git a/org.metaborg.meta.lang.nabl/syntax/formulas/Propositions.sdf b/org.metaborg.meta.lang.nabl/syntax/formulas/Propositions.sdf
@@ -3,15 +3,16 @@ imports terms/Terms terms/Vars core/Namespaces core/Scopes core/Properties
 
 exports
   context-free syntax
-    "true"                                -> Proposition {cons("True")}
-    "false"                               -> Proposition {cons("False")}
-    VarRef "==" Term                      -> Proposition {cons("Eq")}
-    VarRef "=>" Pattern                   -> Proposition {cons("Match")}
-    "definition" "of" VarRef "=>" Var     -> Proposition {cons("DefOf")}
-    Scope "=>" Var                        -> Proposition {cons("ScopeOf")}
-    VarRef "refers" "to" NamespaceRef Var -> Proposition {cons("RefersTo")}
-    VarRef "has" PropertyRef Var          -> Proposition {cons("HasProperty")}
-    Term Relation Term                    -> Proposition {cons("InRelation")}
+    "true"                                         -> Proposition {cons("True")}
+    "false"                                        -> Proposition {cons("False")}
+    VarRef "==" Term                               -> Proposition {cons("Eq")}
+    VarRef "=>" Pattern                            -> Proposition {cons("Match")}
+    "definition" "of" VarRef "=>" Var              -> Proposition {cons("DefOf")}
+    "definition" "of" NamespaceRef VarRef "=>" Var -> Proposition {cons("DefOf")}
+    Scope "=>" Var                                 -> Proposition {cons("ScopeOf")}
+    Term "resolves" "to" NamespaceRef Var          -> Proposition {cons("ResolvesTo")}
+    VarRef "has" PropertyRef Var                   -> Proposition {cons("HasProperty")}
+    Term Relation Term                             -> Proposition {cons("InRelation")}
 
   context-free syntax
     CONTENTCOMPLETE -> Proposition {cons("COMPLETION-Proposition")}
diff --git a/org.metaborg.meta.lang.nabl/syntax/formulas/Propositions.sdf3 b/org.metaborg.meta.lang.nabl/syntax/formulas/Propositions.sdf3
@@ -12,11 +12,12 @@ templates // propositions
   Proposition.True     = <true>
   Proposition.False    = <false>
 
-  Proposition.Eq       = [[VarRef] == [Term]] 
-  Proposition.Match    = [[VarRef] => [Pattern]]
-  Proposition.DefOf    = [definition of [VarRef] => [Var]]
-  Proposition.ScopeOf  = [[Scope] => [Var]]
-  Proposition.RefersTo = <<VarRef> refers to <NamespaceRef> <Var>>
-
+  Proposition.Eq          = [[VarRef] == [Term]] 
+  Proposition.Match       = [[VarRef] => [Pattern]]
+  Proposition.DefOf       = [definition of [VarRef] => [Var]]
+  Proposition.DefOf       = [definition of [NamespaceRef] [VarRef] => [Var]]
+  Proposition.ScopeOf     = [[Scope] => [Var]]
+  Proposition.ResolvesTo  = <<Term> resolves to <NamespaceRef> <Var>> // TODO: add resolution scope
+
   Proposition.HasProperty = <<VarRef> has <PropertyRef> <Var>>
   Proposition.InRelation  = [[Term] [Relation] [Term]]