URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-15 Maxime van Noppen <yabo@lrde.epita.fr> Minor changes * scl-syn/Lexical.sdf: Fix rules being in the wrong place. * scoolt/Expression.meta: New. scl-syn/Lexical.sdf | 40 +++++++++++++++++++++------------------- scoolt/Expression.meta | 1 + 2 files changed, 22 insertions(+), 19 deletions(-) Index: branches/scool-ng/src/scoolt/Expression.meta =================================================================== --- branches/scool-ng/src/scoolt/Expression.meta (revision 0) +++ branches/scool-ng/src/scoolt/Expression.meta (revision 82) @@ -0,0 +1 @@ +Meta([Syntax("concrete-syn")]) Index: branches/scool-ng/src/scl-syn/Lexical.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Lexical.sdf (revision 81) +++ branches/scool-ng/src/scl-syn/Lexical.sdf (revision 82) @@ -14,24 +14,6 @@ "\"" [A-Za-z0-9]* "\"" -> String {cons("String")} ~[\ ]~[\]\|]*~[\ ] -> RawCxx - "class" -> Identifier {reject} - "concept" -> Identifier {reject} - "var" -> Identifier {reject} - "final" -> Identifier {reject} - "models" -> Identifier {reject} - "type" -> Identifier {reject} - "ref" -> Identifier {reject} - "public" -> Identifier {reject} - "protected" -> Identifier {reject} - "private" -> Identifier {reject} - "where" -> Identifier {reject} - - "char" -> Identifier {reject} - "int" -> Identifier {reject} - "float" -> Identifier {reject} - "string" -> Identifier {reject} - "void" -> Identifier {reject} - "//" ~[\n]* [\n] -> LAYOUT [\ \t\n] -> LAYOUT BlockComment -> LAYOUT @@ -53,10 +35,30 @@ context-free syntax + + "class" -> Identifier {reject} + "concept" -> Identifier {reject} + "var" -> Identifier {reject} + "final" -> Identifier {reject} + "models" -> Identifier {reject} + "type" -> Identifier {reject} + "ref" -> Identifier {reject} + "public" -> Identifier {reject} + "protected" -> Identifier {reject} + "private" -> Identifier {reject} + "where" -> Identifier {reject} + + "char" -> Identifier {reject} + "int" -> Identifier {reject} + "float" -> Identifier {reject} + "string" -> Identifier {reject} + "void" -> Identifier {reject} + + Id -> Identifier {cons("Identifier")} lexical restrictions - Identifier -/- [A-Za-z0-9\_] + Id -/- [A-Za-z0-9\_] Asterisk -/- [\/] Slash -/- [\*] -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)