From 60359485ccaf8356d1d9ee6e093361cd37efe9f1 Mon Sep 17 00:00:00 2001 From: bringert Date: Thu, 20 Sep 2007 15:20:44 +0000 Subject: [PATCH] Restored the GFCC.cf from before the patch "simplify GFCC syntax". This is the version that the exisiting code actually uses, except for the two cases of Int instead of Integer. --- src/GF/Canon/GFCC/GFCC.cf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/GF/Canon/GFCC/GFCC.cf b/src/GF/Canon/GFCC/GFCC.cf index 5e302e91f..65657a259 100644 --- a/src/GF/Canon/GFCC/GFCC.cf +++ b/src/GF/Canon/GFCC/GFCC.cf @@ -21,19 +21,20 @@ define trA a = Tr a [] ; R. Term ::= "[" [Term] "]" ; -- record/table P. Term ::= "(" Term "!" Term ")" ; -- projection/selection S. Term ::= "(" [Term] ")" ; -- sequence with ++ -KS. Term ::= String ; -- token -KP. Term ::= "[" "pre" [String] "[" [Variant] "]" "]" ; -V. Term ::= "$" Integer ; -- argument -C. Term ::= Integer ; -- parameter value/label +K. Term ::= Tokn ; -- token +V. Term ::= "$" Integer ; -- argument +C. Term ::= Integer ; -- parameter value/label F. Term ::= CId ; -- global constant FV. Term ::= "[|" [Term] "|]" ; -- free variation -W. Term ::= "(" String "+" [String] ")" ; -- prefix + suffix table +W. Term ::= "(" String "+" Term ")" ; -- prefix + suffix table RP. Term ::= "(" Term "@" Term ")"; -- record parameter alias TM. Term ::= "?" ; -- lin of metavariable L. Term ::= "(" CId "->" Term ")" ; -- lambda abstracted table BV. Term ::= "#" CId ; -- lambda-bound variable +KS. Tokn ::= String ; +KP. Tokn ::= "[" "pre" [String] "[" [Variant] "]" "]" ; Var. Variant ::= [String] "/" [String] ;