diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-03-06 21:27:14 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-03-06 21:27:14 +0000 |
| commit | 27508654c01c5ebad3c495629ccbd49c067429ab (patch) | |
| tree | 440e4ec729664e71a29e8d33d8fdcb7af3757a15 /src/GF/Devel/Grammar | |
| parent | fe863958533cd905939241e6fa50af439058cf5a (diff) | |
option -mac to vt command (uses open with ps)
Diffstat (limited to 'src/GF/Devel/Grammar')
| -rw-r--r-- | src/GF/Devel/Grammar/Construct.hs | 2 | ||||
| -rw-r--r-- | src/GF/Devel/Grammar/Grammar.hs | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/GF/Devel/Grammar/Construct.hs b/src/GF/Devel/Grammar/Construct.hs index eb4ce857d..5b4215843 100644 --- a/src/GF/Devel/Grammar/Construct.hs +++ b/src/GF/Devel/Grammar/Construct.hs @@ -69,7 +69,7 @@ isLink j = jform j == JLink -- constructing judgements from parse tree emptyJudgement :: JudgementForm -> Judgement -emptyJudgement form = Judgement form meta meta meta (identC "#NOLINK") 0 where +emptyJudgement form = Judgement form meta meta meta (identC "#") 0 where meta = Meta 0 addJType :: Type -> Judgement -> Judgement diff --git a/src/GF/Devel/Grammar/Grammar.hs b/src/GF/Devel/Grammar/Grammar.hs index 9a9855f8e..df5a3907e 100644 --- a/src/GF/Devel/Grammar/Grammar.hs +++ b/src/GF/Devel/Grammar/Grammar.hs @@ -22,7 +22,7 @@ data Module = Module { mtype :: ModuleType, miscomplete :: Bool, minterfaces :: [(Ident,Ident)], -- non-empty for functors - minstances :: [((Ident,MInclude),[(Ident,Ident)])], -- non-empty for instant'ions + minstances :: [((Ident,MInclude),[(Ident,Ident)])], -- non-empty for inst'ions mextends :: [(Ident,MInclude)], mopens :: [(Ident,Ident)], -- used name, original name mflags :: Map Ident String, @@ -49,8 +49,8 @@ data Judgement = Judgement { jtype :: Type, -- context type lincat - type PType jdef :: Term, -- lindef def lindef lin def constrs jprintname :: Term, -- - - prname prname - - - jlink :: Ident, - jposition :: Int + jlink :: Ident, -- if inherited, the supermodule name, else # + jposition :: Int -- line number where def begins } deriving Show @@ -136,11 +136,11 @@ data Patt = | PAlt Patt Patt -- ^ disjunctive pattern: p1 | p2 | PSeq Patt Patt -- ^ sequence of token parts: p + q | PRep Patt -- ^ repetition of token part: p* - | PChar -- ^ string of length one - | PChars String -- ^ list of characters + | PChar -- ^ string of length one: ? + | PChars String -- ^ list of characters: ["aeiou"] - | PMacro Ident -- - | PM Ident Ident + | PMacro Ident -- #p + | PM Ident Ident -- #m.p deriving (Read, Show, Eq, Ord) |