diff --git a/UserInterfaces/AnyText.Core/Grammars/GrammarContext.cs b/UserInterfaces/AnyText.Core/Grammars/GrammarContext.cs index b67ddd74..c7a04d78 100644 --- a/UserInterfaces/AnyText.Core/Grammars/GrammarContext.cs +++ b/UserInterfaces/AnyText.Core/Grammars/GrammarContext.cs @@ -70,24 +70,5 @@ public LiteralRule ResolveKeyword(string keyword, params FormattingInstruction[] } return rule; } - - /// - /// Resolves the rule for the given keyword - /// - /// the keyword - /// true, if trailing whitespaces are allowed, otherwise false - /// formatting instructions for this keyword - /// a literal rule that represents matching the provided keyword - public LiteralRule ResolveKeyword(string keyword, bool trailingWhitespaces, params FormattingInstruction[] formattingInstructions) - { - if (!_keywords.TryGetValue(keyword, out var rule)) - { - rule = _grammar.CreateKeywordRule(keyword); - rule.TrailingWhitespaces = trailingWhitespaces; - rule.FormattingInstructions = formattingInstructions; - _keywords.Add(keyword, rule); - } - return rule; - } } } diff --git a/UserInterfaces/AnyText.Core/Model/AddAssignReferenceRule.cs b/UserInterfaces/AnyText.Core/Model/AddAssignReferenceRule.cs index bf97d373..c4b02a85 100644 --- a/UserInterfaces/AnyText.Core/Model/AddAssignReferenceRule.cs +++ b/UserInterfaces/AnyText.Core/Model/AddAssignReferenceRule.cs @@ -92,7 +92,7 @@ public override bool CanSynthesize(object semanticElement) { if (semanticElement is ParseObject parseObject && parseObject.TryPeekModelToken(Feature, GetCollection, null, out var assigned)) { - return assigned != null; + return true; } return false; } diff --git a/UserInterfaces/AnyText.Core/Model/AddAssignRule.cs b/UserInterfaces/AnyText.Core/Model/AddAssignRule.cs index 818da846..124bdb34 100644 --- a/UserInterfaces/AnyText.Core/Model/AddAssignRule.cs +++ b/UserInterfaces/AnyText.Core/Model/AddAssignRule.cs @@ -59,7 +59,7 @@ public override bool CanSynthesize(object semanticElement) { if (semanticElement is ParseObject parseObject && parseObject.TryPeekModelToken(Feature, GetCollection, null, out var assigned)) { - return !EqualityComparer.Default.Equals(assigned, default); + return true; } return false; } diff --git a/UserInterfaces/AnyText.Core/Model/ExistsAssignRule.cs b/UserInterfaces/AnyText.Core/Model/ExistsAssignRule.cs index 9b08f711..29b30e76 100644 --- a/UserInterfaces/AnyText.Core/Model/ExistsAssignRule.cs +++ b/UserInterfaces/AnyText.Core/Model/ExistsAssignRule.cs @@ -69,7 +69,7 @@ public override bool CanSynthesize(object semanticElement) /// public override RuleApplication Synthesize(object semanticElement, ParsePosition position, ParseContext context) { - if (semanticElement is ParseObject parseObject && parseObject.TryConsumeModelToken(Feature, GetValue, context, out var assigned)) + if (semanticElement is ParseObject parseObject && parseObject.TryConsumeModelToken(Feature, GetValue, context, out var assigned) && assigned) { return base.Synthesize(semanticElement, position, context); } diff --git a/UserInterfaces/AnyText.Core/PrettyPrinting/FormattingInstruction.cs b/UserInterfaces/AnyText.Core/PrettyPrinting/FormattingInstruction.cs index df86797a..d71ebab2 100644 --- a/UserInterfaces/AnyText.Core/PrettyPrinting/FormattingInstruction.cs +++ b/UserInterfaces/AnyText.Core/PrettyPrinting/FormattingInstruction.cs @@ -31,5 +31,10 @@ public abstract class FormattingInstruction /// Denotes a shared instance for a newline instruction /// public static readonly FormattingInstruction Newline = new NewlineInstruction(); + + /// + /// Denotes a shared instance for a space supression + /// + public static readonly FormattingInstruction SupressSpace = new SupressSpaceInstruction(); } } diff --git a/UserInterfaces/AnyText.Core/PrettyPrinting/PrettyPrintWriter.cs b/UserInterfaces/AnyText.Core/PrettyPrinting/PrettyPrintWriter.cs index cddd6317..bcc98fb6 100644 --- a/UserInterfaces/AnyText.Core/PrettyPrinting/PrettyPrintWriter.cs +++ b/UserInterfaces/AnyText.Core/PrettyPrinting/PrettyPrintWriter.cs @@ -18,6 +18,14 @@ public class PrettyPrintWriter private bool _lastWasNewline = true; private bool _writeSpace = false; + /// + /// Supresses rendering a space character before the next token + /// + public void SupressSpace() + { + _writeSpace = false; + } + /// /// Creates a new instance /// diff --git a/UserInterfaces/AnyText.Core/PrettyPrinting/SupressSpaceInstruction.cs b/UserInterfaces/AnyText.Core/PrettyPrinting/SupressSpaceInstruction.cs new file mode 100644 index 00000000..2cc6602b --- /dev/null +++ b/UserInterfaces/AnyText.Core/PrettyPrinting/SupressSpaceInstruction.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NMF.AnyText.PrettyPrinting +{ + internal class SupressSpaceInstruction : FormattingInstruction + { + public override void Apply(PrettyPrintWriter writer) + { + writer.SupressSpace(); + } + } +} diff --git a/UserInterfaces/AnyText.Core/Rules/SingleRuleApplication.cs b/UserInterfaces/AnyText.Core/Rules/SingleRuleApplication.cs index a17b385a..80eafcfc 100644 --- a/UserInterfaces/AnyText.Core/Rules/SingleRuleApplication.cs +++ b/UserInterfaces/AnyText.Core/Rules/SingleRuleApplication.cs @@ -96,7 +96,7 @@ public override void IterateLiterals(Action action public override void Write(PrettyPrintWriter writer, ParseContext context) { Inner?.Write(writer, context); - + ApplyFormattingInstructions(writer); } } } diff --git a/UserInterfaces/AnyText.Generator/Transformation/AnytextCodeGenerator.cs b/UserInterfaces/AnyText.Generator/Transformation/AnytextCodeGenerator.cs index 687dccf5..f88fc7ad 100644 --- a/UserInterfaces/AnyText.Generator/Transformation/AnytextCodeGenerator.cs +++ b/UserInterfaces/AnyText.Generator/Transformation/AnytextCodeGenerator.cs @@ -95,10 +95,6 @@ private static CodeExpression CreateResolveKeyword(string keyword, IParserExpres var res = new CodeMethodInvokeExpression(_contextRef, nameof(GrammarContext.ResolveKeyword), new CodePrimitiveExpression(unescaped)); if (parserExpression != null) { - if (parserExpression.NoSpace) - { - res.Parameters.Add(new CodePrimitiveExpression(false)); - } foreach (var instruction in parserExpression.FormattingInstructions) { res.Parameters.Add(CreateFormattingInstruction(instruction)); @@ -174,18 +170,18 @@ private static CodeObjectCreateExpression AddFormattingInstructions(CodeObjectCr return createRuleExpression; } - private static void AddFormattingInstructions(CodeMemberMethod initializeMethod, IParserExpression parserExpression) + private static void AddFormattingInstructions(CodeMemberMethod initializeMethod, IEnumerable formattingInstructions) { - if (parserExpression.FormattingInstructions.Count > 0) + if (formattingInstructions.Any()) { - var formattingInstructions = new CodeArrayCreateExpression(typeof(PrettyPrinting.FormattingInstruction).ToTypeReference()); + var formattingInstructionsArray = new CodeArrayCreateExpression(typeof(PrettyPrinting.FormattingInstruction).ToTypeReference()); initializeMethod.Statements.Add(new CodeAssignStatement( new CodePropertyReferenceExpression(null, nameof(AnyText.Rules.Rule.FormattingInstructions)), - formattingInstructions)); + formattingInstructionsArray)); - foreach (var instruction in parserExpression.FormattingInstructions) + foreach (var instruction in formattingInstructions) { - formattingInstructions.Initializers.Add(CreateFormattingInstruction(instruction)); + formattingInstructionsArray.Initializers.Add(CreateFormattingInstruction(instruction)); } } } @@ -200,6 +196,9 @@ private static CodeExpression CreateFormattingInstruction(FormattingInstruction return new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(typeof(PrettyPrinting.FormattingInstruction).ToTypeReference()), nameof(PrettyPrinting.FormattingInstruction.Unindent)); case FormattingInstruction.Newline: return new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(typeof(PrettyPrinting.FormattingInstruction).ToTypeReference()), nameof(PrettyPrinting.FormattingInstruction.Newline)); + case FormattingInstruction.ForbidSpace: + case FormattingInstruction.AvoidSpace: + return new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(typeof(PrettyPrinting.FormattingInstruction).ToTypeReference()), nameof(PrettyPrinting.FormattingInstruction.SupressSpace)); default: throw new ArgumentOutOfRangeException(nameof(formattingInstruction)); } @@ -639,13 +638,13 @@ public override void Transform(IFeatureExpression input, CodeTypeDeclaration out initialize.Statements.Add(new CodeAssignStatement( new CodePropertyReferenceExpression(null, nameof(QuoteRule.Inner)), CreateParserExpression(input.Assigned, Rule(), Rule(), context))); - if (input.NoSpace) + if (input.FormattingInstructions.Contains(FormattingInstruction.ForbidSpace)) { initialize.Statements.Add(new CodeAssignStatement( new CodePropertyReferenceExpression(null, "TrailingWhitespaces"), new CodePrimitiveExpression(false))); } - AddFormattingInstructions(initialize, input); + AddFormattingInstructions(initialize, input.FormattingInstructions.Concat(input.Assigned.FormattingInstructions)); output.Members.Add(initialize); var feature = new CodeMemberProperty diff --git a/UserInterfaces/AnyText/AnyText.anytext b/UserInterfaces/AnyText/AnyText.anytext index 4e58072a..e40ad8a0 100644 --- a/UserInterfaces/AnyText/AnyText.anytext +++ b/UserInterfaces/AnyText/AnyText.anytext @@ -1,31 +1,33 @@ grammar AnyText (anytext) root Grammar -imports http://github.com/NMFCode/NMF/AnyText +imports https://github.com/NMFCode/NMF/AnyText -Grammar: 'grammar' Name=ID ('(' LanguageId=ID ')')? 'root' StartRule=[ClassRule] -Imports+=MetamodelImport* +Grammar: 'grammar' Name=ID ('(' LanguageId=ID ')')? 'root' StartRule=[ClassRule] +Imports+=MetamodelImport* Rules+=Rule+; -MetamodelImport: 'imports' (Prefix=ID 'from')? File=Uri; +MetamodelImport: 'imports' (Prefix=ID 'from')? File=Uri ; Rule: ClassRule | DataRule | FragmentRule | ParanthesisRule | EnumRule; ClassRule: InheritanceRule | ModelRule; -InheritanceRule: Name=ID RuleTypeFragment ':' Subtypes+=[ClassRule] ('|' Subtypes+=[ClassRule])+ ';' ; -ModelRule: Name=ID RuleTypeFragment ':' Expression=ParserExpression ';' ; -DataRule: 'terminal' Name=ID RuleTypeFragment ':' Regex=Regex ('surround' 'with' SurroundCharacter=Char)? ('escape' EscapeRules+=EscapeRule (',' EscapeRules+=EscapeRule)*)? ';' ; +InheritanceRule: Name=ID RuleTypeFragment ':' Subtypes+=[ClassRule] ('|' Subtypes+=[ClassRule])+ ';' ; +ModelRule: Name=ID RuleTypeFragment ':' Expression=ParserExpression ';' ; +DataRule: 'terminal' Name=ID RuleTypeFragment ':' Regex=Regex ('surround' 'with' SurroundCharacter=Char)? ('escape' EscapeRules+=EscapeRule (',' EscapeRules+=EscapeRule)*)? ';' ; EscapeRule: Character=Char 'as' Escape=Keyword; -FragmentRule: 'fragment' Name=ID 'processes' (Prefix=ID '.')? TypeName=ID ':' Expression=ParserExpression ';' ; -ParanthesisRule: 'parantheses' Name=ID ':' OpeningParanthesis=KeywordExpression InnerRule=[ClassRule] ClosingParanthesis=KeywordExpression ';' ; -EnumRule: 'enum' Name=ID RuleTypeFragment ':' (Literals+=LiteralRule)+ ';' ; +FragmentRule: 'fragment' Name=ID 'processes' (Prefix=ID '.')? TypeName=ID ':' Expression=ParserExpression ';' ; +ParanthesisRule: 'parantheses' Name=ID ':' OpeningParanthesis=KeywordExpression InnerRule=[ClassRule] ClosingParanthesis=KeywordExpression ';' ; +EnumRule: 'enum' Name=ID RuleTypeFragment ':' (Literals+=LiteralRule)+ ';' ; LiteralRule: Literal=ID '=>' Keyword=Keyword ; -fragment RuleTypeFragment processes Rule: ('returns' (Prefix=ID '.')? TypeName=ID)?; -fragment FormattingInstructionFragment processes ParserExpression: (NoSpace?='')?(FormattingInstructions+=FormattingInstruction)*; +fragment RuleTypeFragment processes Rule: ('returns' (Prefix=ID '.')? TypeName=ID)? ; +fragment FormattingInstructionFragment processes ParserExpression: (FormattingInstructions+=FormattingInstruction)*; enum FormattingInstruction: Newline => '' Indent => '' - Unindent => ''; + Unindent => '' + AvoidSpace => '' + ForbidSpace => ''; ParserExpression: ChoiceExpression | SequenceExpression | ConjunctiveParserExpression; ConjunctiveParserExpression returns ParserExpression: PlusExpression | StarExpression | MaybeExpression | BasicParserExpression; @@ -33,20 +35,20 @@ BasicParserExpression returns ParserExpression: NegativeLookaheadExpression | Ke parantheses ParanthesisExpression: '(' ParserExpression ')'; SequenceExpression: InnerExpressions+=ConjunctiveParserExpression (InnerExpressions+=ConjunctiveParserExpression)+; -PlusExpression: Inner=BasicParserExpression '+' FormattingInstructionFragment; -StarExpression: Inner=BasicParserExpression '*' FormattingInstructionFragment; -MaybeExpression: Inner=BasicParserExpression '?' FormattingInstructionFragment; +PlusExpression: Inner=BasicParserExpression '+' FormattingInstructionFragment; +StarExpression: Inner=BasicParserExpression '*' FormattingInstructionFragment; +MaybeExpression: Inner=BasicParserExpression '?' FormattingInstructionFragment; KeywordExpression: Keyword=Keyword FormattingInstructionFragment; ChoiceExpression: (Alternatives+=ConjunctiveParserExpression '|')+ Alternatives+=ConjunctiveParserExpression; -AssignExpression: Feature=ID '=' Assigned=BasicParserExpression FormattingInstructionFragment; -AddAssignExpression: Feature=ID '+=' Assigned=BasicParserExpression FormattingInstructionFragment; -ExistsAssignExpression: Feature=ID '?=' Assigned=BasicParserExpression FormattingInstructionFragment; +AssignExpression: Feature=ID '=' Assigned=BasicParserExpression FormattingInstructionFragment; +AddAssignExpression: Feature=ID '+=' Assigned=BasicParserExpression FormattingInstructionFragment; +ExistsAssignExpression: Feature=ID '?=' Assigned=BasicParserExpression FormattingInstructionFragment; NegativeLookaheadExpression: '!' Inner=BasicParserExpression; RuleExpression: Rule=[Rule] FormattingInstructionFragment !'=' !'+=' !'?=' ; -ReferenceExpression: '[' ReferencedRule=[Rule] ']'; +ReferenceExpression: '[' ReferencedRule=[Rule] ']'; terminal ID: /[a-zA-Z]\w*/; terminal Keyword: /(\\\\|\\'|[^'\\])+/ surround with ' escape \ as '\\\\', ' as '\\\''; diff --git a/UserInterfaces/AnyText/AnyText.nmeta b/UserInterfaces/AnyText/AnyText.nmeta index 992145a2..1ed6900e 100644 --- a/UserInterfaces/AnyText/AnyText.nmeta +++ b/UserInterfaces/AnyText/AnyText.nmeta @@ -1,5 +1,5 @@  - + @@ -29,7 +29,6 @@ - @@ -73,6 +72,8 @@ + + diff --git a/UserInterfaces/AnyText/Grammars/AnyTextGrammar.cs b/UserInterfaces/AnyText/Grammars/AnyTextGrammar.cs index 09bc898e..a393be42 100644 --- a/UserInterfaces/AnyText/Grammars/AnyTextGrammar.cs +++ b/UserInterfaces/AnyText/Grammars/AnyTextGrammar.cs @@ -101,7 +101,7 @@ public override void Initialize(GrammarContext context) context.ResolveRule(), context.ResolveKeyword(":", NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline, NMF.AnyText.PrettyPrinting.FormattingInstruction.Indent), context.ResolveRule(), - new OneOrMoreRule(new SequenceRule(context.ResolveKeyword("|"), context.ResolveRule())), + new OneOrMoreRule(new SequenceRule(context.ResolveKeyword("|"), context.ResolveRule()), NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace), context.ResolveKeyword(";", NMF.AnyText.PrettyPrinting.FormattingInstruction.Unindent, NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline)}; } } @@ -132,7 +132,7 @@ public override void Initialize(GrammarContext context) context.ResolveKeyword(":", NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline, NMF.AnyText.PrettyPrinting.FormattingInstruction.Indent), context.ResolveRule(), new ZeroOrOneRule(new SequenceRule(context.ResolveKeyword("surround"), context.ResolveKeyword("with"), context.ResolveRule())), - new ZeroOrOneRule(new SequenceRule(context.ResolveKeyword("escape"), context.ResolveRule(), new ZeroOrMoreRule(new SequenceRule(context.ResolveKeyword(","), context.ResolveRule())))), + new ZeroOrOneRule(new SequenceRule(context.ResolveKeyword("escape"), context.ResolveRule(), new ZeroOrMoreRule(new SequenceRule(context.ResolveKeyword(","), context.ResolveRule()))), NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace), context.ResolveKeyword(";", NMF.AnyText.PrettyPrinting.FormattingInstruction.Unindent, NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline)}; } } @@ -158,7 +158,7 @@ public override void Initialize(GrammarContext context) context.ResolveKeyword("fragment"), context.ResolveRule(), context.ResolveKeyword("processes"), - new ZeroOrOneRule(new SequenceRule(context.ResolveRule(), context.ResolveKeyword(".", false))), + new ZeroOrOneRule(new SequenceRule(context.ResolveRule(), context.ResolveKeyword(".", NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace))), context.ResolveRule(), context.ResolveKeyword(":", NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline, NMF.AnyText.PrettyPrinting.FormattingInstruction.Indent), context.ResolveRule(), @@ -192,7 +192,7 @@ public override void Initialize(GrammarContext context) context.ResolveRule(), context.ResolveRule(), context.ResolveKeyword(":", NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline, NMF.AnyText.PrettyPrinting.FormattingInstruction.Indent), - new OneOrMoreRule(context.ResolveRule()), + new OneOrMoreRule(context.ResolveRule(), NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace), context.ResolveKeyword(";", NMF.AnyText.PrettyPrinting.FormattingInstruction.Unindent, NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline)}; } } @@ -214,7 +214,7 @@ public partial class RuleTypeFragmentRule : QuoteRule public override void Initialize(GrammarContext context) { - Inner = new ZeroOrOneRule(new SequenceRule(context.ResolveKeyword("returns"), new ZeroOrOneRule(new SequenceRule(context.ResolveRule(), context.ResolveKeyword(".", false))), context.ResolveRule())); + Inner = new ZeroOrOneRule(new SequenceRule(context.ResolveKeyword("returns"), new ZeroOrOneRule(new SequenceRule(context.ResolveRule(), context.ResolveKeyword(".", NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace))), context.ResolveRule()), NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace); } } @@ -223,7 +223,7 @@ public partial class FormattingInstructionFragmentRule : QuoteRule public override void Initialize(GrammarContext context) { - Inner = new SequenceRule(new ZeroOrOneRule(context.ResolveRule()), new ZeroOrMoreRule(context.ResolveRule())); + Inner = new ZeroOrMoreRule(context.ResolveRule()); } } @@ -235,11 +235,15 @@ public override void Initialize(GrammarContext context) Alternatives = new NMF.AnyText.Rules.Rule[] { context.ResolveKeyword(""), context.ResolveKeyword(""), - context.ResolveKeyword("")}; + context.ResolveKeyword(""), + context.ResolveKeyword(""), + context.ResolveKeyword("")}; Values = new NMF.AnyText.Metamodel.FormattingInstruction[] { NMF.AnyText.Metamodel.FormattingInstruction.Newline, NMF.AnyText.Metamodel.FormattingInstruction.Indent, - NMF.AnyText.Metamodel.FormattingInstruction.Unindent}; + NMF.AnyText.Metamodel.FormattingInstruction.Unindent, + NMF.AnyText.Metamodel.FormattingInstruction.AvoidSpace, + NMF.AnyText.Metamodel.FormattingInstruction.ForbidSpace}; } } @@ -373,7 +377,7 @@ public override void Initialize(GrammarContext context) { Rules = new NMF.AnyText.Rules.Rule[] { context.ResolveRule(), - context.ResolveKeyword("="), + context.ResolveKeyword("=", NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace), context.ResolveRule(), context.ResolveRule()}; } @@ -386,7 +390,7 @@ public override void Initialize(GrammarContext context) { Rules = new NMF.AnyText.Rules.Rule[] { context.ResolveRule(), - context.ResolveKeyword("+="), + context.ResolveKeyword("+=", NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace), context.ResolveRule(), context.ResolveRule()}; } @@ -399,7 +403,7 @@ public override void Initialize(GrammarContext context) { Rules = new NMF.AnyText.Rules.Rule[] { context.ResolveRule(), - context.ResolveKeyword("?="), + context.ResolveKeyword("?=", NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace), context.ResolveRule(), context.ResolveRule()}; } @@ -436,7 +440,7 @@ public partial class ReferenceExpressionRule : ModelElementRule(), context.ResolveKeyword("]")}; } @@ -523,6 +527,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline}; } public override ICollection GetCollection(IGrammar semanticElement, ParseContext context) @@ -650,6 +656,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline}; } protected override string GetValue(IMetamodelImport semanticElement, ParseContext context) @@ -753,6 +761,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override IParserExpression GetValue(IModelRule semanticElement, ParseContext context) @@ -910,6 +920,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override IParserExpression GetValue(IFragmentRule semanticElement, ParseContext context) @@ -964,6 +976,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override string GetValue(IRule semanticElement, ParseContext context) @@ -991,6 +1005,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override IKeywordExpression GetValue(IParanthesisRule semanticElement, ParseContext context) @@ -1094,6 +1110,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.Newline}; } protected override string GetValue(ILiteralRule semanticElement, ParseContext context) @@ -1170,6 +1188,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override IParserExpression GetValue(IUnaryParserExpression semanticElement, ParseContext context) @@ -1273,6 +1293,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override string GetValue(IFeatureExpression semanticElement, ParseContext context) @@ -1327,6 +1349,8 @@ protected override String Feature public override void Initialize(GrammarContext context) { Inner = context.ResolveRule(); + FormattingInstructions = new NMF.AnyText.PrettyPrinting.FormattingInstruction[] { + NMF.AnyText.PrettyPrinting.FormattingInstruction.SupressSpace}; } protected override IClassRule GetValue(IReferenceExpression semanticElement, ParseContext context) @@ -1361,32 +1385,5 @@ public override void Initialize(GrammarContext context) return semanticElement.FormattingInstructions; } } - - public class ParserExpressionNoSpaceRule : ExistsAssignRule - { - - protected override String Feature - { - get - { - return "NoSpace"; - } - } - - public override void Initialize(GrammarContext context) - { - Inner = context.ResolveKeyword(""); - } - - protected override bool GetValue(IParserExpression semanticElement, ParseContext context) - { - return semanticElement.NoSpace; - } - - protected override void SetValue(IParserExpression semanticElement, bool propertyValue, ParseContext context) - { - semanticElement.NoSpace = propertyValue; - } - } } } diff --git a/UserInterfaces/AnyText/Metamodel/AddAssignExpression.cs b/UserInterfaces/AnyText/Metamodel/AddAssignExpression.cs index f44d4d23..a9ef5bd7 100644 --- a/UserInterfaces/AnyText/Metamodel/AddAssignExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/AddAssignExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the AddAssignExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//AddAssignExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//AddAssignExpression")] public partial class AddAssignExpression : FeatureExpression, IAddAssignExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class AddAssignExpression : FeatureExpression, IAddAssignExpressi { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//AddAssignExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//AddAssignExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//AddAssignExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//AddAssignExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/AssignExpression.cs b/UserInterfaces/AnyText/Metamodel/AssignExpression.cs index cd0b30a0..b4bbb180 100644 --- a/UserInterfaces/AnyText/Metamodel/AssignExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/AssignExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the AssignExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//AssignExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//AssignExpression")] public partial class AssignExpression : FeatureExpression, IAssignExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class AssignExpression : FeatureExpression, IAssignExpression, IM { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//AssignExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//AssignExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//AssignExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//AssignExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ChoiceExpression.cs b/UserInterfaces/AnyText/Metamodel/ChoiceExpression.cs index e09f6136..585b9639 100644 --- a/UserInterfaces/AnyText/Metamodel/ChoiceExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/ChoiceExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ChoiceExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ChoiceExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ChoiceExpression")] public partial class ChoiceExpression : ParserExpression, IChoiceExpression, IModelElement { @@ -110,7 +110,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ChoiceExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ChoiceExpression"))); } return _classInstance; } @@ -213,7 +213,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ChoiceExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ChoiceExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ClassRule.cs b/UserInterfaces/AnyText/Metamodel/ClassRule.cs index 01651be4..4dc68449 100644 --- a/UserInterfaces/AnyText/Metamodel/ClassRule.cs +++ b/UserInterfaces/AnyText/Metamodel/ClassRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ClassRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ClassRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ClassRule")] [DebuggerDisplayAttribute("ClassRule {Name}")] public abstract partial class ClassRule : Rule, IClassRule, IModelElement { @@ -54,7 +54,7 @@ public abstract partial class ClassRule : Rule, IClassRule, IModelElement { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ClassRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ClassRule"))); } return _classInstance; } @@ -67,7 +67,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ClassRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ClassRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/DataRule.cs b/UserInterfaces/AnyText/Metamodel/DataRule.cs index 9688f42d..8333ec05 100644 --- a/UserInterfaces/AnyText/Metamodel/DataRule.cs +++ b/UserInterfaces/AnyText/Metamodel/DataRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the DataRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//DataRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//DataRule")] [DebuggerDisplayAttribute("DataRule {Name}")] public partial class DataRule : Rule, IDataRule, IModelElement { @@ -174,7 +174,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//DataRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//DataRule"))); } return _classInstance; } @@ -344,7 +344,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//DataRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//DataRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/EnumRule.cs b/UserInterfaces/AnyText/Metamodel/EnumRule.cs index c113cb89..2d5357ee 100644 --- a/UserInterfaces/AnyText/Metamodel/EnumRule.cs +++ b/UserInterfaces/AnyText/Metamodel/EnumRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the EnumRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//EnumRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//EnumRule")] [DebuggerDisplayAttribute("EnumRule {Name}")] public partial class EnumRule : Rule, IEnumRule, IModelElement { @@ -110,7 +110,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//EnumRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//EnumRule"))); } return _classInstance; } @@ -213,7 +213,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//EnumRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//EnumRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/EscapeRule.cs b/UserInterfaces/AnyText/Metamodel/EscapeRule.cs index c97989e5..9f7927fa 100644 --- a/UserInterfaces/AnyText/Metamodel/EscapeRule.cs +++ b/UserInterfaces/AnyText/Metamodel/EscapeRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the EscapeRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//EscapeRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//EscapeRule")] public partial class EscapeRule : ModelElement, IEscapeRule, IModelElement { @@ -117,7 +117,7 @@ public string Escape { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//EscapeRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//EscapeRule"))); } return _classInstance; } @@ -197,7 +197,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//EscapeRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//EscapeRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ExistsAssignExpression.cs b/UserInterfaces/AnyText/Metamodel/ExistsAssignExpression.cs index 1d5e17f5..75e89b9c 100644 --- a/UserInterfaces/AnyText/Metamodel/ExistsAssignExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/ExistsAssignExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ExistsAssignExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression")] public partial class ExistsAssignExpression : FeatureExpression, IExistsAssignExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class ExistsAssignExpression : FeatureExpression, IExistsAssignEx { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/FeatureExpression.cs b/UserInterfaces/AnyText/Metamodel/FeatureExpression.cs index 5f27eddb..e364aeda 100644 --- a/UserInterfaces/AnyText/Metamodel/FeatureExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/FeatureExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the FeatureExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//FeatureExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//FeatureExpression")] public abstract partial class FeatureExpression : ParserExpression, IFeatureExpression, IModelElement { @@ -153,7 +153,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//FeatureExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//FeatureExpression"))); } return _classInstance; } @@ -281,7 +281,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//FeatureExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//FeatureExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/FormattingInstruction.cs b/UserInterfaces/AnyText/Metamodel/FormattingInstruction.cs index 8ae27365..23e0f96e 100644 --- a/UserInterfaces/AnyText/Metamodel/FormattingInstruction.cs +++ b/UserInterfaces/AnyText/Metamodel/FormattingInstruction.cs @@ -33,7 +33,7 @@ namespace NMF.AnyText.Metamodel { - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//FormattingInstruction")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//FormattingInstruction")] public enum FormattingInstruction { @@ -42,5 +42,9 @@ public enum FormattingInstruction Indent = 1, Unindent = 2, + + AvoidSpace = 3, + + ForbidSpace = 4, } } diff --git a/UserInterfaces/AnyText/Metamodel/FragmentRule.cs b/UserInterfaces/AnyText/Metamodel/FragmentRule.cs index d7025652..850852b5 100644 --- a/UserInterfaces/AnyText/Metamodel/FragmentRule.cs +++ b/UserInterfaces/AnyText/Metamodel/FragmentRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the FragmentRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//FragmentRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//FragmentRule")] [DebuggerDisplayAttribute("FragmentRule {Name}")] public partial class FragmentRule : Rule, IFragmentRule, IModelElement { @@ -122,7 +122,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//FragmentRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//FragmentRule"))); } return _classInstance; } @@ -211,7 +211,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//FragmentRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//FragmentRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/Grammar.cs b/UserInterfaces/AnyText/Metamodel/Grammar.cs index 4735f8a3..d97c57d9 100644 --- a/UserInterfaces/AnyText/Metamodel/Grammar.cs +++ b/UserInterfaces/AnyText/Metamodel/Grammar.cs @@ -37,9 +37,9 @@ namespace NMF.AnyText.Metamodel /// The default implementation of the Grammar class /// [XmlIdentifierAttribute("Name")] - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//Grammar")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//Grammar")] [DebuggerDisplayAttribute("Grammar {Name}")] public partial class Grammar : ModelElement, IGrammar, IModelElement { @@ -244,7 +244,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//Grammar"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//Grammar"))); } return _classInstance; } @@ -515,7 +515,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//Grammar"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//Grammar"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/IAddAssignExpression.cs b/UserInterfaces/AnyText/Metamodel/IAddAssignExpression.cs index 0a85c4f8..dd759322 100644 --- a/UserInterfaces/AnyText/Metamodel/IAddAssignExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IAddAssignExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(AddAssignExpression))] [XmlDefaultImplementationTypeAttribute(typeof(AddAssignExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//AddAssignExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//AddAssignExpression")] public interface IAddAssignExpression : IModelElement, IFeatureExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IAssignExpression.cs b/UserInterfaces/AnyText/Metamodel/IAssignExpression.cs index 4d3c5948..532e6067 100644 --- a/UserInterfaces/AnyText/Metamodel/IAssignExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IAssignExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(AssignExpression))] [XmlDefaultImplementationTypeAttribute(typeof(AssignExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//AssignExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//AssignExpression")] public interface IAssignExpression : IModelElement, IFeatureExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IChoiceExpression.cs b/UserInterfaces/AnyText/Metamodel/IChoiceExpression.cs index 257cae5b..8dca3275 100644 --- a/UserInterfaces/AnyText/Metamodel/IChoiceExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IChoiceExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ChoiceExpression))] [XmlDefaultImplementationTypeAttribute(typeof(ChoiceExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ChoiceExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ChoiceExpression")] public interface IChoiceExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/IClassRule.cs b/UserInterfaces/AnyText/Metamodel/IClassRule.cs index 1dcb19f9..560333d5 100644 --- a/UserInterfaces/AnyText/Metamodel/IClassRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IClassRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ClassRule))] [XmlDefaultImplementationTypeAttribute(typeof(ClassRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ClassRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ClassRule")] public interface IClassRule : IModelElement, IRule { } diff --git a/UserInterfaces/AnyText/Metamodel/IDataRule.cs b/UserInterfaces/AnyText/Metamodel/IDataRule.cs index ea6ebae4..479e6424 100644 --- a/UserInterfaces/AnyText/Metamodel/IDataRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IDataRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(DataRule))] [XmlDefaultImplementationTypeAttribute(typeof(DataRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//DataRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//DataRule")] public interface IDataRule : IModelElement, IRule { diff --git a/UserInterfaces/AnyText/Metamodel/IEnumRule.cs b/UserInterfaces/AnyText/Metamodel/IEnumRule.cs index 36ad0333..1cd51180 100644 --- a/UserInterfaces/AnyText/Metamodel/IEnumRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IEnumRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(EnumRule))] [XmlDefaultImplementationTypeAttribute(typeof(EnumRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//EnumRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//EnumRule")] public interface IEnumRule : IModelElement, IRule { diff --git a/UserInterfaces/AnyText/Metamodel/IEscapeRule.cs b/UserInterfaces/AnyText/Metamodel/IEscapeRule.cs index 8d67bd21..f55f3105 100644 --- a/UserInterfaces/AnyText/Metamodel/IEscapeRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IEscapeRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(EscapeRule))] [XmlDefaultImplementationTypeAttribute(typeof(EscapeRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//EscapeRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//EscapeRule")] public interface IEscapeRule : IModelElement { diff --git a/UserInterfaces/AnyText/Metamodel/IExistsAssignExpression.cs b/UserInterfaces/AnyText/Metamodel/IExistsAssignExpression.cs index 16b4fa5d..701f1c2d 100644 --- a/UserInterfaces/AnyText/Metamodel/IExistsAssignExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IExistsAssignExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ExistsAssignExpression))] [XmlDefaultImplementationTypeAttribute(typeof(ExistsAssignExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ExistsAssignExpression")] public interface IExistsAssignExpression : IModelElement, IFeatureExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IFeatureExpression.cs b/UserInterfaces/AnyText/Metamodel/IFeatureExpression.cs index 79b403a3..91fa9fd3 100644 --- a/UserInterfaces/AnyText/Metamodel/IFeatureExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IFeatureExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(FeatureExpression))] [XmlDefaultImplementationTypeAttribute(typeof(FeatureExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//FeatureExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//FeatureExpression")] public interface IFeatureExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/IFragmentRule.cs b/UserInterfaces/AnyText/Metamodel/IFragmentRule.cs index a11fa0c1..39c2bc8b 100644 --- a/UserInterfaces/AnyText/Metamodel/IFragmentRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IFragmentRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(FragmentRule))] [XmlDefaultImplementationTypeAttribute(typeof(FragmentRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//FragmentRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//FragmentRule")] public interface IFragmentRule : IModelElement, IRule { diff --git a/UserInterfaces/AnyText/Metamodel/IGrammar.cs b/UserInterfaces/AnyText/Metamodel/IGrammar.cs index 4ac9b5ed..1e437de9 100644 --- a/UserInterfaces/AnyText/Metamodel/IGrammar.cs +++ b/UserInterfaces/AnyText/Metamodel/IGrammar.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(Grammar))] [XmlDefaultImplementationTypeAttribute(typeof(Grammar))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//Grammar")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//Grammar")] public interface IGrammar : IModelElement { diff --git a/UserInterfaces/AnyText/Metamodel/IInheritanceRule.cs b/UserInterfaces/AnyText/Metamodel/IInheritanceRule.cs index ab411347..3eea564b 100644 --- a/UserInterfaces/AnyText/Metamodel/IInheritanceRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IInheritanceRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(InheritanceRule))] [XmlDefaultImplementationTypeAttribute(typeof(InheritanceRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//InheritanceRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//InheritanceRule")] public interface IInheritanceRule : IModelElement, IClassRule { diff --git a/UserInterfaces/AnyText/Metamodel/IKeywordExpression.cs b/UserInterfaces/AnyText/Metamodel/IKeywordExpression.cs index 89db3db0..8d372829 100644 --- a/UserInterfaces/AnyText/Metamodel/IKeywordExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IKeywordExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(KeywordExpression))] [XmlDefaultImplementationTypeAttribute(typeof(KeywordExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//KeywordExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//KeywordExpression")] public interface IKeywordExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/ILiteralRule.cs b/UserInterfaces/AnyText/Metamodel/ILiteralRule.cs index 88cc871f..92d04caf 100644 --- a/UserInterfaces/AnyText/Metamodel/ILiteralRule.cs +++ b/UserInterfaces/AnyText/Metamodel/ILiteralRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(LiteralRule))] [XmlDefaultImplementationTypeAttribute(typeof(LiteralRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//LiteralRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//LiteralRule")] public interface ILiteralRule : IModelElement { diff --git a/UserInterfaces/AnyText/Metamodel/IMaybeExpression.cs b/UserInterfaces/AnyText/Metamodel/IMaybeExpression.cs index df7019a5..47ab2e1e 100644 --- a/UserInterfaces/AnyText/Metamodel/IMaybeExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IMaybeExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(MaybeExpression))] [XmlDefaultImplementationTypeAttribute(typeof(MaybeExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//MaybeExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//MaybeExpression")] public interface IMaybeExpression : IModelElement, IUnaryParserExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IMetamodelImport.cs b/UserInterfaces/AnyText/Metamodel/IMetamodelImport.cs index a09cdddb..5598bff1 100644 --- a/UserInterfaces/AnyText/Metamodel/IMetamodelImport.cs +++ b/UserInterfaces/AnyText/Metamodel/IMetamodelImport.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(MetamodelImport))] [XmlDefaultImplementationTypeAttribute(typeof(MetamodelImport))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//MetamodelImport")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//MetamodelImport")] public interface IMetamodelImport : IModelElement { diff --git a/UserInterfaces/AnyText/Metamodel/IModelRule.cs b/UserInterfaces/AnyText/Metamodel/IModelRule.cs index f9106855..031bb4a7 100644 --- a/UserInterfaces/AnyText/Metamodel/IModelRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IModelRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ModelRule))] [XmlDefaultImplementationTypeAttribute(typeof(ModelRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ModelRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ModelRule")] public interface IModelRule : IModelElement, IClassRule { diff --git a/UserInterfaces/AnyText/Metamodel/INegativeLookaheadExpression.cs b/UserInterfaces/AnyText/Metamodel/INegativeLookaheadExpression.cs index 27d74bb9..340e01e0 100644 --- a/UserInterfaces/AnyText/Metamodel/INegativeLookaheadExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/INegativeLookaheadExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(NegativeLookaheadExpression))] [XmlDefaultImplementationTypeAttribute(typeof(NegativeLookaheadExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression")] public interface INegativeLookaheadExpression : IModelElement, IUnaryParserExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IParanthesisRule.cs b/UserInterfaces/AnyText/Metamodel/IParanthesisRule.cs index e06f0882..f4599b63 100644 --- a/UserInterfaces/AnyText/Metamodel/IParanthesisRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IParanthesisRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ParanthesisRule))] [XmlDefaultImplementationTypeAttribute(typeof(ParanthesisRule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ParanthesisRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ParanthesisRule")] public interface IParanthesisRule : IModelElement, IClassRule { diff --git a/UserInterfaces/AnyText/Metamodel/IParserExpression.cs b/UserInterfaces/AnyText/Metamodel/IParserExpression.cs index eeec2f51..7e987f72 100644 --- a/UserInterfaces/AnyText/Metamodel/IParserExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IParserExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ParserExpression))] [XmlDefaultImplementationTypeAttribute(typeof(ParserExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ParserExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ParserExpression")] public interface IParserExpression : IModelElement { @@ -53,17 +53,5 @@ IOrderedSetExpression FormattingInstructions { get; } - - /// - /// The NoSpace property - /// - [TypeConverterAttribute(typeof(LowercaseBooleanConverter))] - [CategoryAttribute("ParserExpression")] - [XmlAttributeAttribute(true)] - bool NoSpace - { - get; - set; - } } } diff --git a/UserInterfaces/AnyText/Metamodel/IPlusExpression.cs b/UserInterfaces/AnyText/Metamodel/IPlusExpression.cs index 885a5834..a66ce107 100644 --- a/UserInterfaces/AnyText/Metamodel/IPlusExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IPlusExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(PlusExpression))] [XmlDefaultImplementationTypeAttribute(typeof(PlusExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//PlusExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//PlusExpression")] public interface IPlusExpression : IModelElement, IUnaryParserExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IReferenceExpression.cs b/UserInterfaces/AnyText/Metamodel/IReferenceExpression.cs index 3537e711..33420413 100644 --- a/UserInterfaces/AnyText/Metamodel/IReferenceExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IReferenceExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(ReferenceExpression))] [XmlDefaultImplementationTypeAttribute(typeof(ReferenceExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ReferenceExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ReferenceExpression")] public interface IReferenceExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/IRule.cs b/UserInterfaces/AnyText/Metamodel/IRule.cs index c5cdbfe8..885ba975 100644 --- a/UserInterfaces/AnyText/Metamodel/IRule.cs +++ b/UserInterfaces/AnyText/Metamodel/IRule.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(Rule))] [XmlDefaultImplementationTypeAttribute(typeof(Rule))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//Rule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//Rule")] public interface IRule : IModelElement { diff --git a/UserInterfaces/AnyText/Metamodel/IRuleExpression.cs b/UserInterfaces/AnyText/Metamodel/IRuleExpression.cs index 3eb60443..8c99e842 100644 --- a/UserInterfaces/AnyText/Metamodel/IRuleExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IRuleExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(RuleExpression))] [XmlDefaultImplementationTypeAttribute(typeof(RuleExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//RuleExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//RuleExpression")] public interface IRuleExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/ISequenceExpression.cs b/UserInterfaces/AnyText/Metamodel/ISequenceExpression.cs index 5f238e64..46b7618c 100644 --- a/UserInterfaces/AnyText/Metamodel/ISequenceExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/ISequenceExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(SequenceExpression))] [XmlDefaultImplementationTypeAttribute(typeof(SequenceExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//SequenceExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//SequenceExpression")] public interface ISequenceExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/IStarExpression.cs b/UserInterfaces/AnyText/Metamodel/IStarExpression.cs index 19c22b42..4817b26b 100644 --- a/UserInterfaces/AnyText/Metamodel/IStarExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IStarExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(StarExpression))] [XmlDefaultImplementationTypeAttribute(typeof(StarExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//StarExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//StarExpression")] public interface IStarExpression : IModelElement, IUnaryParserExpression { } diff --git a/UserInterfaces/AnyText/Metamodel/IUnaryParserExpression.cs b/UserInterfaces/AnyText/Metamodel/IUnaryParserExpression.cs index 02b78e20..56d7de7e 100644 --- a/UserInterfaces/AnyText/Metamodel/IUnaryParserExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/IUnaryParserExpression.cs @@ -38,7 +38,7 @@ namespace NMF.AnyText.Metamodel /// [DefaultImplementationTypeAttribute(typeof(UnaryParserExpression))] [XmlDefaultImplementationTypeAttribute(typeof(UnaryParserExpression))] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression")] public interface IUnaryParserExpression : IModelElement, IParserExpression { diff --git a/UserInterfaces/AnyText/Metamodel/InheritanceRule.cs b/UserInterfaces/AnyText/Metamodel/InheritanceRule.cs index e5acf88a..7ac3f30c 100644 --- a/UserInterfaces/AnyText/Metamodel/InheritanceRule.cs +++ b/UserInterfaces/AnyText/Metamodel/InheritanceRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the InheritanceRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//InheritanceRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//InheritanceRule")] [DebuggerDisplayAttribute("InheritanceRule {Name}")] public partial class InheritanceRule : ClassRule, IInheritanceRule, IModelElement { @@ -98,7 +98,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//InheritanceRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//InheritanceRule"))); } return _classInstance; } @@ -172,7 +172,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//InheritanceRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//InheritanceRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/KeywordExpression.cs b/UserInterfaces/AnyText/Metamodel/KeywordExpression.cs index 730e76de..39b825a6 100644 --- a/UserInterfaces/AnyText/Metamodel/KeywordExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/KeywordExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the KeywordExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//KeywordExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//KeywordExpression")] public partial class KeywordExpression : ParserExpression, IKeywordExpression, IModelElement { @@ -85,7 +85,7 @@ public string Keyword { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//KeywordExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//KeywordExpression"))); } return _classInstance; } @@ -147,7 +147,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//KeywordExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//KeywordExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/LiteralRule.cs b/UserInterfaces/AnyText/Metamodel/LiteralRule.cs index 29d60f47..0148e67a 100644 --- a/UserInterfaces/AnyText/Metamodel/LiteralRule.cs +++ b/UserInterfaces/AnyText/Metamodel/LiteralRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the LiteralRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//LiteralRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//LiteralRule")] public partial class LiteralRule : ModelElement, ILiteralRule, IModelElement { @@ -149,7 +149,7 @@ public Nullable Value { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//LiteralRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//LiteralRule"))); } return _classInstance; } @@ -247,7 +247,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//LiteralRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//LiteralRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/MaybeExpression.cs b/UserInterfaces/AnyText/Metamodel/MaybeExpression.cs index 534c509d..3e47ada0 100644 --- a/UserInterfaces/AnyText/Metamodel/MaybeExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/MaybeExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the MaybeExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//MaybeExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//MaybeExpression")] public partial class MaybeExpression : UnaryParserExpression, IMaybeExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class MaybeExpression : UnaryParserExpression, IMaybeExpression, { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//MaybeExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//MaybeExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//MaybeExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//MaybeExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/MetamodelImport.cs b/UserInterfaces/AnyText/Metamodel/MetamodelImport.cs index 46f613a5..93055186 100644 --- a/UserInterfaces/AnyText/Metamodel/MetamodelImport.cs +++ b/UserInterfaces/AnyText/Metamodel/MetamodelImport.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the MetamodelImport class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//MetamodelImport")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//MetamodelImport")] public partial class MetamodelImport : ModelElement, IMetamodelImport, IModelElement { @@ -117,7 +117,7 @@ public string Prefix { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//MetamodelImport"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//MetamodelImport"))); } return _classInstance; } @@ -197,7 +197,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//MetamodelImport"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//MetamodelImport"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ModelRule.cs b/UserInterfaces/AnyText/Metamodel/ModelRule.cs index ead7173f..006bc0e5 100644 --- a/UserInterfaces/AnyText/Metamodel/ModelRule.cs +++ b/UserInterfaces/AnyText/Metamodel/ModelRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ModelRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ModelRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ModelRule")] [DebuggerDisplayAttribute("ModelRule {Name}")] public partial class ModelRule : ClassRule, IModelRule, IModelElement { @@ -122,7 +122,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ModelRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ModelRule"))); } return _classInstance; } @@ -211,7 +211,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ModelRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ModelRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/NegativeLookaheadExpression.cs b/UserInterfaces/AnyText/Metamodel/NegativeLookaheadExpression.cs index d7d315ba..1fb59044 100644 --- a/UserInterfaces/AnyText/Metamodel/NegativeLookaheadExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/NegativeLookaheadExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the NegativeLookaheadExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression")] public partial class NegativeLookaheadExpression : UnaryParserExpression, INegativeLookaheadExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class NegativeLookaheadExpression : UnaryParserExpression, INegat { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//NegativeLookaheadExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ParanthesisRule.cs b/UserInterfaces/AnyText/Metamodel/ParanthesisRule.cs index db95a874..041e1d6d 100644 --- a/UserInterfaces/AnyText/Metamodel/ParanthesisRule.cs +++ b/UserInterfaces/AnyText/Metamodel/ParanthesisRule.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ParanthesisRule class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ParanthesisRule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ParanthesisRule")] [DebuggerDisplayAttribute("ParanthesisRule {Name}")] public partial class ParanthesisRule : ClassRule, IParanthesisRule, IModelElement { @@ -208,7 +208,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ParanthesisRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ParanthesisRule"))); } return _classInstance; } @@ -363,7 +363,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ParanthesisRule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ParanthesisRule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ParserExpression.cs b/UserInterfaces/AnyText/Metamodel/ParserExpression.cs index 92c4dc5a..78c02bb1 100644 --- a/UserInterfaces/AnyText/Metamodel/ParserExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/ParserExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ParserExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ParserExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ParserExpression")] public abstract partial class ParserExpression : ModelElement, IParserExpression, IModelElement { @@ -50,14 +50,6 @@ public abstract partial class ParserExpression : ModelElement, IParserExpression private static Lazy _formattingInstructionsAttribute = new Lazy(RetrieveFormattingInstructionsAttribute); - /// - /// The backing field for the NoSpace property - /// - [DebuggerBrowsableAttribute(DebuggerBrowsableState.Never)] - private bool _noSpace; - - private static Lazy _noSpaceAttribute = new Lazy(RetrieveNoSpaceAttribute); - private static IClass _classInstance; /// @@ -85,31 +77,6 @@ public IOrderedSetExpression FormattingInstructions } } - /// - /// The NoSpace property - /// - [TypeConverterAttribute(typeof(LowercaseBooleanConverter))] - [CategoryAttribute("ParserExpression")] - [XmlAttributeAttribute(true)] - public bool NoSpace - { - get - { - return this._noSpace; - } - set - { - if ((this._noSpace != value)) - { - bool old = this._noSpace; - ValueChangedEventArgs e = new ValueChangedEventArgs(old, value); - this.OnPropertyChanging("NoSpace", e, _noSpaceAttribute); - this._noSpace = value; - this.OnPropertyChanged("NoSpace", e, _noSpaceAttribute); - } - } - } - /// /// Gets the Class model for this type /// @@ -119,7 +86,7 @@ public bool NoSpace { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ParserExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ParserExpression"))); } return _classInstance; } @@ -150,11 +117,6 @@ private void FormattingInstructionsCollectionChanged(object sender, NotifyCollec this.OnCollectionChanged("FormattingInstructions", e, _formattingInstructionsAttribute); } - private static ITypedElement RetrieveNoSpaceAttribute() - { - return ((ITypedElement)(((ModelElement)(NMF.AnyText.Metamodel.ParserExpression.ClassInstance)).Resolve("NoSpace"))); - } - /// /// Resolves the given attribute name /// @@ -174,10 +136,6 @@ protected override object GetAttributeValue(string attribute, int index) return null; } } - if ((attribute == "NOSPACE")) - { - return this.NoSpace; - } return base.GetAttributeValue(attribute, index); } @@ -195,35 +153,6 @@ protected override System.Collections.IList GetCollectionForFeature(string featu return base.GetCollectionForFeature(feature); } - /// - /// Sets a value to the given feature - /// - /// The requested feature - /// The value that should be set to that feature - protected override void SetFeature(string feature, object value) - { - if ((feature == "NOSPACE")) - { - this.NoSpace = ((bool)(value)); - return; - } - base.SetFeature(feature, value); - } - - /// - /// Gets the property expression for the given attribute - /// - /// An incremental property expression - /// The requested attribute in upper case - protected override NMF.Expressions.INotifyExpression GetExpressionForAttribute(string attribute) - { - if ((attribute == "NOSPACE")) - { - return Observable.Box(new NoSpaceProxy(this)); - } - return base.GetExpressionForAttribute(attribute); - } - /// /// Gets the Class for this model element /// @@ -231,40 +160,9 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ParserExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ParserExpression"))); } return _classInstance; } - - /// - /// Represents a proxy to represent an incremental access to the NoSpace property - /// - private sealed class NoSpaceProxy : ModelPropertyChange - { - - /// - /// Creates a new observable property access proxy - /// - /// The model instance element for which to create the property access proxy - public NoSpaceProxy(IParserExpression modelElement) : - base(modelElement, "NoSpace") - { - } - - /// - /// Gets or sets the value of this expression - /// - public override bool Value - { - get - { - return this.ModelElement.NoSpace; - } - set - { - this.ModelElement.NoSpace = value; - } - } - } } } diff --git a/UserInterfaces/AnyText/Metamodel/PlusExpression.cs b/UserInterfaces/AnyText/Metamodel/PlusExpression.cs index dfcabcba..bea6bbad 100644 --- a/UserInterfaces/AnyText/Metamodel/PlusExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/PlusExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the PlusExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//PlusExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//PlusExpression")] public partial class PlusExpression : UnaryParserExpression, IPlusExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class PlusExpression : UnaryParserExpression, IPlusExpression, IM { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//PlusExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//PlusExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//PlusExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//PlusExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/ReferenceExpression.cs b/UserInterfaces/AnyText/Metamodel/ReferenceExpression.cs index a05f3040..a16666d4 100644 --- a/UserInterfaces/AnyText/Metamodel/ReferenceExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/ReferenceExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the ReferenceExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//ReferenceExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//ReferenceExpression")] public partial class ReferenceExpression : ParserExpression, IReferenceExpression, IModelElement { @@ -104,7 +104,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ReferenceExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ReferenceExpression"))); } return _classInstance; } @@ -179,7 +179,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//ReferenceExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//ReferenceExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/Rule.cs b/UserInterfaces/AnyText/Metamodel/Rule.cs index ee39c93e..71ed7ce8 100644 --- a/UserInterfaces/AnyText/Metamodel/Rule.cs +++ b/UserInterfaces/AnyText/Metamodel/Rule.cs @@ -37,9 +37,9 @@ namespace NMF.AnyText.Metamodel /// The default implementation of the Rule class /// [XmlIdentifierAttribute("Name")] - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//Rule")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//Rule")] [DebuggerDisplayAttribute("Rule {Name}")] public abstract partial class Rule : ModelElement, IRule, IModelElement { @@ -152,7 +152,7 @@ public string Prefix { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//Rule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//Rule"))); } return _classInstance; } @@ -261,7 +261,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//Rule"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//Rule"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/RuleExpression.cs b/UserInterfaces/AnyText/Metamodel/RuleExpression.cs index ad549210..593f28d3 100644 --- a/UserInterfaces/AnyText/Metamodel/RuleExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/RuleExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the RuleExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//RuleExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//RuleExpression")] public partial class RuleExpression : ParserExpression, IRuleExpression, IModelElement { @@ -104,7 +104,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//RuleExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//RuleExpression"))); } return _classInstance; } @@ -179,7 +179,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//RuleExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//RuleExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/SequenceExpression.cs b/UserInterfaces/AnyText/Metamodel/SequenceExpression.cs index 456ac57a..f275959d 100644 --- a/UserInterfaces/AnyText/Metamodel/SequenceExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/SequenceExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the SequenceExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//SequenceExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//SequenceExpression")] public partial class SequenceExpression : ParserExpression, ISequenceExpression, IModelElement { @@ -110,7 +110,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//SequenceExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//SequenceExpression"))); } return _classInstance; } @@ -213,7 +213,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//SequenceExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//SequenceExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/StarExpression.cs b/UserInterfaces/AnyText/Metamodel/StarExpression.cs index 9118d0f4..d439cffb 100644 --- a/UserInterfaces/AnyText/Metamodel/StarExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/StarExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the StarExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//StarExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//StarExpression")] public partial class StarExpression : UnaryParserExpression, IStarExpression, IModelElement { @@ -53,7 +53,7 @@ public partial class StarExpression : UnaryParserExpression, IStarExpression, IM { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//StarExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//StarExpression"))); } return _classInstance; } @@ -66,7 +66,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//StarExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//StarExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Metamodel/UnaryParserExpression.cs b/UserInterfaces/AnyText/Metamodel/UnaryParserExpression.cs index 5b2f4db0..4661bda0 100644 --- a/UserInterfaces/AnyText/Metamodel/UnaryParserExpression.cs +++ b/UserInterfaces/AnyText/Metamodel/UnaryParserExpression.cs @@ -36,9 +36,9 @@ namespace NMF.AnyText.Metamodel /// /// The default implementation of the UnaryParserExpression class /// - [XmlNamespaceAttribute("http://github.com/NMFCode/NMF/AnyText")] + [XmlNamespaceAttribute("https://github.com/NMFCode/NMF/AnyText")] [XmlNamespacePrefixAttribute("anytext")] - [ModelRepresentationClassAttribute("http://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression")] + [ModelRepresentationClassAttribute("https://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression")] public abstract partial class UnaryParserExpression : ParserExpression, IUnaryParserExpression, IModelElement { @@ -121,7 +121,7 @@ public override IEnumerableExpression ReferencedElements { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression"))); } return _classInstance; } @@ -210,7 +210,7 @@ public override IClass GetClass() { if ((_classInstance == null)) { - _classInstance = ((IClass)(MetaRepository.Instance.Resolve("http://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression"))); + _classInstance = ((IClass)(MetaRepository.Instance.Resolve("https://github.com/NMFCode/NMF/AnyText#//UnaryParserExpression"))); } return _classInstance; } diff --git a/UserInterfaces/AnyText/Properties/ModelRegistry.cs b/UserInterfaces/AnyText/Properties/ModelRegistry.cs index f0e2bc90..9698d3c5 100644 --- a/UserInterfaces/AnyText/Properties/ModelRegistry.cs +++ b/UserInterfaces/AnyText/Properties/ModelRegistry.cs @@ -1,3 +1,3 @@ using NMF.Models; -[assembly: ModelMetadata("http://github.com/NMFCode/NMF/AnyText", "AnyText.nmeta")] \ No newline at end of file +[assembly: ModelMetadata("https://github.com/NMFCode/NMF/AnyText", "AnyText.nmeta")] \ No newline at end of file diff --git a/UserInterfaces/AnyText/anytext.ecore b/UserInterfaces/AnyText/anytext.ecore index fec44310..09fc8af7 100644 --- a/UserInterfaces/AnyText/anytext.ecore +++ b/UserInterfaces/AnyText/anytext.ecore @@ -1,6 +1,6 @@ + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="AnyText" nsURI="https://github.com/NMFCode/NMF/AnyText" nsPrefix="anytext"> - @@ -95,6 +93,8 @@ + +