--- a/cmajor++/Cm/Cm.Debugger/OutputLine.cpp
+++ b/cmajor++/Cm/Cm.Debugger/OutputLine.cpp
@@ -742,32 +742,32 @@
 void OutputLineGrammar::GetReferencedGrammars()
 {
     ParsingDomainPtr parsingDomain = GetParsingDomain();
-    GrammarPtr grammar0 = parsingDomain->GetGrammar("Cm.Debugger.GdbReplyGrammar");
+    GrammarPtr grammar0 = parsingDomain->GetGrammar("Soul.Parsing.stdlib");
     if (!grammar0)
     {
-        grammar0 = Cm::Debugger::GdbReplyGrammar::Create(parsingDomain);
+        grammar0 = Soul::Parsing::stdlib::Create(parsingDomain);
     }
     AddGrammarReference(grammar0);
-    GrammarPtr grammar1 = parsingDomain->GetGrammar("Soul.Parsing.stdlib");
+    GrammarPtr grammar1 = parsingDomain->GetGrammar("Cm.Debugger.GdbReplyGrammar");
     if (!grammar1)
     {
-        grammar1 = Soul::Parsing::stdlib::Create(parsingDomain);
+        grammar1 = Cm::Debugger::GdbReplyGrammar::Create(parsingDomain);
     }
     AddGrammarReference(grammar1);
 }
 
 void OutputLineGrammar::CreateRules()
 {
+    AddRuleLink(RuleLinkPtr(new RuleLink("FunArgList", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.FunArgList")));
     AddRuleLink(RuleLinkPtr(new RuleLink("SourceFileLine", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.SourceFileLine")));
-    AddRuleLink(RuleLinkPtr(new RuleLink("identifier", std::static_pointer_cast<Grammar>(GetPtr()), "Soul.Parsing.stdlib.identifier")));
+    AddRuleLink(RuleLinkPtr(new RuleLink("octal", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.octal")));
+    AddRuleLink(RuleLinkPtr(new RuleLink("SignalLoc", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.SignalLoc")));
     AddRuleLink(RuleLinkPtr(new RuleLink("FunFileLine", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.FunFileLine")));
     AddRuleLink(RuleLinkPtr(new RuleLink("spaces", std::static_pointer_cast<Grammar>(GetPtr()), "Soul.Parsing.stdlib.spaces")));
     AddRuleLink(RuleLinkPtr(new RuleLink("int", std::static_pointer_cast<Grammar>(GetPtr()), "Soul.Parsing.stdlib.int")));
-    AddRuleLink(RuleLinkPtr(new RuleLink("octal", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.octal")));
+    AddRuleLink(RuleLinkPtr(new RuleLink("identifier", std::static_pointer_cast<Grammar>(GetPtr()), "Soul.Parsing.stdlib.identifier")));
     AddRuleLink(RuleLinkPtr(new RuleLink("SourceLine", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.SourceLine")));
     AddRuleLink(RuleLinkPtr(new RuleLink("SignalDesc", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.SignalDesc")));
-    AddRuleLink(RuleLinkPtr(new RuleLink("SignalLoc", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.SignalLoc")));
-    AddRuleLink(RuleLinkPtr(new RuleLink("FunArgList", std::static_pointer_cast<Grammar>(GetPtr()), "GdbReplyGrammar.FunArgList")));
     AddRule(RulePtr(new OutputLineRule("OutputLine", GetScope(),
         ParserPtr(new AlternativeParser(
             ParserPtr(new AlternativeParser(
@@ -1000,8 +1000,8 @@
 
 void SignalContGrammar::CreateRules()
 {
+    AddRuleLink(RuleLinkPtr(new RuleLink("spaces", std::static_pointer_cast<Grammar>(GetPtr()), "Soul.Parsing.stdlib.spaces")));
     AddRuleLink(RuleLinkPtr(new RuleLink("SignalCont", std::static_pointer_cast<Grammar>(GetPtr()), "OutputLineGrammar.SignalCont")));
-    AddRuleLink(RuleLinkPtr(new RuleLink("spaces", std::static_pointer_cast<Grammar>(GetPtr()), "Soul.Parsing.stdlib.spaces")));
     AddRule(RulePtr(new SCRule("SC", GetScope(),
         ParserPtr(new NonterminalParser("SignalCont", "SignalCont", 1)))));
     SetSkipRuleName("spaces");