diff --git a/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3 b/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3 index 5be6dbb..b3128aa 100644 --- a/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3 +++ b/ql/src/StrategoLang/gradual-types/signatures-namespaced.sdf3 @@ -12,10 +12,10 @@ context-free syntax StrategoLang-Dyn.Dyn = [?] { } StrategoLang-Type.TupleT = [[StrategoLang-Type] * [{StrategoLang-Type " * "}+]] { } StrategoLang-Type.DynT = StrategoLang-Dyn { } - StrategoLang-Type.StringT = "string" { } - StrategoLang-Type.IntT = "int" { } - StrategoLang-Type.RealT = "real" { } - StrategoLang-Type.BlobT = "blob" { } + StrategoLang-Type.StringGT = "string" { } + StrategoLang-Type.IntGT = "int" { } + StrategoLang-Type.RealGT = "real" { } + StrategoLang-Type.BlobGT = "blob" { } StrategoLang-Type = [([StrategoLang-Type])] {bracket} StrategoLang-Type = StrategoLang-SortT { } StrategoLang-SortT.SortT = [[StrategoLang-Id]([{StrategoLang-Type ", "}*])] { } diff --git a/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3 b/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3 index 5924f01..5dba21f 100644 --- a/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3 +++ b/ql/src/StrategoLang/sugar/strategies-namespaced.sdf3 @@ -42,7 +42,7 @@ context-free syntax StrategoLang-Strategy.BA = [<[StrategoLang-Strategy]> [StrategoLang-Term]] { } StrategoLang-Strategy.LChoice = [[StrategoLang-Strategy] <+ [StrategoLang-Strategy]] {right} StrategoLang-Strategy.Rec = ( )> { } - StrategoLang-Strategy.Not = )> { } + StrategoLang-Strategy.NNot = )> { } StrategoLang-Strategy.Where = )> { } StrategoLang-Strategy = StrategoLang-With { } StrategoLang-With.With = )> { } diff --git a/ql/src/mix.sdf3 b/ql/src/mix.sdf3 index 7416a7b..49bc080 100644 --- a/ql/src/mix.sdf3 +++ b/ql/src/mix.sdf3 @@ -34,9 +34,9 @@ context-free syntax Type.StrategoMetaVar3 = TypeVar TyExpr.StrategoMetaVar4 = TyExprVar -syntax +//syntax - ID-CF.StrategoMetaVar5 = IDVar +// ID-CF.StrategoMetaVar5 = IDVar lexical sorts