Changeset 447

Timestamp:

Jun 22, 2010 9:43:38 PM (14 years ago)

Author:

Anya Helene Bagge

Message:

merge conflict

Location:

MetaXa/src

Files:

• JavaBackend.rsc (added)
• MagnoliaSpec.mxa (modified) (2 diffs)

MetaXa/src/MagnoliaSpec.mxa

@@ -8 +8 @@
   
   
-construct concept Decl:
+construct concept TopDecl:
   
         syntax
@@ -17 +17 @@
   
                 decl("concept", Name, Attrs, ConceptExpr)
-        
+  
+construct implementation TopDecl:
+
+        syntax
+
+                (: implementation Name Attrs on ConceptExpr defines ImplExpr :)
+                
+        patterns
+        
+                decl("implementation", Name, Attrs, 
 construct generic Decl:
 
-        rules
+        declare rules
         
-                Attrs ==namespace(Name)=> Attrs'        X ==namespace(Name)=> X'
-                ------------------------------------------------------------
-                decl(Sort, Name, Attrs, X)      ==> decl(Sort, Name, Attrs', X'),
-                defines<Sort, qualify(Name), X'>,       attrs<Sort, qualify(Name), Attrs'>
+                decl(Sort, Name, Attrs, X) :- defines<Sort, qualify(Name), Name, Attrs, X>@unresolved
 
 construct literal ConceptExpr: