more grammar

138ac7ea · Michael Kohlhase · e07ad4af · 138ac7ea · 138ac7ea · 138ac7ea
Commit 138ac7ea authored Nov 28, 2017 by Michael Kohlhase
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

gf/Math.gf gf/Math.gf +2 -2

gf/MathEng.gf gf/MathEng.gf +1 -0

gf/MathLex.gf gf/MathLex.gf +2 -0

gf/MathLexEng.gf gf/MathLexEng.gf +4 -2

No files found.
--- a/gf/Math.gf
+++ b/gf/Math.gf
@@ -7,8 +7,8 @@

 abstract Math = 
  Grammar, 
-  Lexicon,
-  MathLex
+  Lexicon
+  ,MathLex
  ,Construction  --- could be compiled here, but not in concretes, as they call Syntax and Grammar
  ,Documentation  --# notpresent
  ,Markup - [stringMark]

--- a/gf/MathEng.gf
+++ b/gf/MathEng.gf
@@ -3,6 +3,7 @@
 concrete MathEng of Math = 
  GrammarEng,
  LexiconEng
+  ,MathLexEng
  ,ConstructionEng
  ,DocumentationEng --# notpresent
  ,MarkupEng - [stringMark]

--- a/gf/MathLex.gf
+++ b/gf/MathLex.gf
 abstract MathLex = Cat ** {
 fun
   positive_A : A ;
+   prime_A : A ;
   integer_N : N ;
+   call_V2 : V2; 
 }
--- a/gf/MathLexEng.gf
+++ b/gf/MathLexEng.gf
 --# -path=.:prelude

-concrete MathLexEng of Lexicon = CatEng **
+concrete MathLexEng of MathLex = CatEng **
  open ParadigmsEng, IrregEng, Prelude in {

 flags
@@ -8,5 +8,7 @@ flags

 lin
  positive_A = regADeg "positive" ;
-  number_N = regN "integer" ;
+  prime_A = regADeg "prime" ;
+  integer_N = regN "integer" ;
+  call_V2 = dirV2 (regV "call") ;
 }