diff --git a/topics/mega/src/MegaADT.rsc b/topics/mega/src/MegaADT.rsc index 895a48ee..1577ff68 100644 --- a/topics/mega/src/MegaADT.rsc +++ b/topics/mega/src/MegaADT.rsc @@ -16,13 +16,13 @@ data MegaDeclaration data MegaMod = local() | variable() | nomod(); data MegaRelation = subsetOf(str x, str y) - | elementOf(str x, str y) - | partOf(str x, str y) - | correspondsTo(str x, str y) - | dependsOn(str x, str y) + | elementOf(str x, str y) + | partOf(str x, str y) + | correspondsTo(str x, str y) + | dependsOn(str x, str y) | refersTo(str x, str y) - | conformsTo(str x, str y) - | realizationOf(str x, str y) + | conformsTo(str x, str y) + | realizationOf(str x, str y) | descriptionOf(str x, str y) | definitionOf(str x, str y) | mapsTo(str f, str x, str y) diff --git a/topics/mega/src/MegaGrammar.rsc b/topics/mega/src/MegaGrammar.rsc index 6428fcd7..76afc6d0 100644 --- a/topics/mega/src/MegaGrammar.rsc +++ b/topics/mega/src/MegaGrammar.rsc @@ -28,14 +28,14 @@ syntax MegaRel | ID "(" ID ")" "|-\>" ID ; syntax MegaBin - = ( "\<" | "subsetOf" ) - | ( ":" | "elementOf" ) - | ( "@" | "partOf" ) - | ( "=" | "correspondsTo" ) - | ( "~\>" | "dependsOn" | "refersTo" ) - | ( "-|" | "conformsTo" ) - | ( "=\>" | "realizationOf" | "descriptionOf" | "definitionOf" ) - ; + = ( "\<" | "subsetOf" ) + | ( ":" | "elementOf" ) + | ( "@" | "partOf" ) + | ( "=" | "correspondsTo" ) + | ( "~\>" | "dependsOn" | "refersTo" ) + | ( "-|" | "conformsTo" ) + | ( "=\>" | "realizationOf" | "descriptionOf" | "definitionOf" ) + ; syntax MegaFun = ":" ID "-\>" ID; lexical ID = @category="Variable" ([a-zA-z] [a-zA-Z0-9_]* !>> [a-zA-Z0-9_]) \ Keywords ; @@ -46,7 +46,6 @@ keyword Keywords syntax STRING = [\"] ![\"]* [\"]; //" lexical MegaDesc = @category="Comment" "{-" MegaDescEl* s "-}"; lexical MegaDescEl = ![\-] | [\-] !>> [}]; - layout L = LAYOUT* !>> [\ \t\n\r]; // !>> "--"; lexical LAYOUT = [\ \t\n\r]; syntax MegaDot = "." MegaComment? ;