Work on automatic generation of field names.

rampelstinskin · Jul 12, 2012 · 35dcfe9 · 35dcfe9
1 parent d80241e
commit 35dcfe9
Show file tree

Hide file tree

Showing 74 changed files with 252 additions and 172 deletions.
diff --git a/Boot/Net-4.0/Nemerle.Compiler.dll b/Boot/Net-4.0/Nemerle.Compiler.dll
diff --git a/Boot/Net-4.0/Nemerle.Macros.dll b/Boot/Net-4.0/Nemerle.Macros.dll
diff --git a/Boot/Net-4.0/Nemerle.Parser.Macro.Model.dll b/Boot/Net-4.0/Nemerle.Parser.Macro.Model.dll
diff --git a/Boot/Net-4.0/Nemerle.Parser.Macro.Parser.dll b/Boot/Net-4.0/Nemerle.Parser.Macro.Parser.dll
diff --git a/Boot/Net-4.0/Nemerle.Parser.Macro.dll b/Boot/Net-4.0/Nemerle.Parser.Macro.dll
diff --git a/Boot/Net-4.0/Nemerle.Parser.dll b/Boot/Net-4.0/Nemerle.Parser.dll
diff --git a/Boot/Net-4.0/Nemerle.dll b/Boot/Net-4.0/Nemerle.dll
diff --git a/Boot/Net-4.0/ncc.exe b/Boot/Net-4.0/ncc.exe
diff --git a/Boot/Net-4.0/ncc32.exe b/Boot/Net-4.0/ncc32.exe
diff --git a/Boot/Net-4.0/ncc64.exe b/Boot/Net-4.0/ncc64.exe
diff --git a/N2GlobalConfig.xml b/N2GlobalConfig.xml
@@ -2,7 +2,10 @@
 <Config>
   <Properties>
     <!--<N2BinPath>$N2Path\Nemerle.Parser.Macro.Parser\bin\Debug</N2BinPath>-->
-    <N2BinPath>$N2Path\Nemerle.Parser.Macro.Parser\bin\$Configuration</N2BinPath>
+    <!--<N2BinPath>$N2Path\Nemerle.Parser.Macro.Parser\bin\$Configuration</N2BinPath>-->
+    <!--<N2BinPath>$N2Path\Nemerle.Parser.Macro.Parser\bin\Release</N2BinPath>-->
+    <!--<N2BinPath>$N2Path\Nemerle.Parser.Macro.Parser-New\bin\Release</N2BinPath>-->
+    <N2BinPath>$N2Path\Nemerle.Parser.Macro.Parser-New\bin\$Configuration</N2BinPath>
   </Properties>
 
   <SpanClasses>

diff --git a/Nemerle.Parser.Macro.Model/Grammar.n b/Nemerle.Parser.Macro.Model/Grammar.n
@@ -101,6 +101,7 @@ namespace Nemerle.Parser.Model
               , rd.Id
               , rd.Name
               , rd.Attributes
+              , rd.TokenFieldNames
               , rd.baseRuleName
               , transformExtentionPrefix(rd)
               )
@@ -111,6 +112,7 @@ namespace Nemerle.Parser.Model
               , rd.Id
               , rd.Name
               , rd.Attributes
+              , rd.TokenFieldNames
               , rd.baseRuleName
               , rd.bindingPower
               , transformExtentionPostfix(rd)
@@ -122,6 +124,7 @@ namespace Nemerle.Parser.Model
               , rd.Id
               , rd.Name
               , rd.Attributes
+              , rd.TokenFieldNames
               , rd.retType
               , transformSimple(rd)
               )
@@ -132,6 +135,7 @@ namespace Nemerle.Parser.Model
               , rd.Id
               , rd.Name
               , rd.Attributes
+              , rd.TokenFieldNames
               , transformRegular(rd)
               )
         }

diff --git a/Nemerle.Parser.Macro.Model/Rule.n b/Nemerle.Parser.Macro.Model/Rule.n
@@ -80,5 +80,16 @@ namespace Nemerle.Parser.Model
         | And(rule)                                      => $"&$(p(rule))"
       }
     }
+
+    public GetSubRules() : list[Rule]
+    {
+      match (this)
+      {
+        | Rule.Sequence(rules) => rules.Filter(rule => !(rule.Type is RuleType.Void));
+        //| _ when rule.Type is RuleType.Void => assert(false);
+        //| _ => [rule]
+        | _ => assert(false);
+      }
+    }
   }
 }
diff --git a/Nemerle.Parser.Macro.Model/RuleAttribute.n b/Nemerle.Parser.Macro.Model/RuleAttribute.n
@@ -20,9 +20,34 @@ namespace Nemerle.Parser.Model
   public variant RuleAttribute : Nemerle.Compiler.Located
   {
     | StartRule
-    | Ast                   { names : list[NameRef]; }
+    | Ast
+      {
+        names : list[NameRef];
+        public GetNames(rd : RuleDefinition) : list[NameRef]
+        {
+          def makeName(name : NameRef, rule : Rule) : NameRef
+          {
+            def makeNameForRule(rule : Rule) : NameRef
+            {
+              | String(str) when rd.TokenFieldNames.Contains(str) => rd.TokenFieldNames.Get(str)
+              | String(str) => Message.FatalError(rule.Location, $<#Name for literal "$str" not defined. You should define by 'token field Name = String;' statement.#>)
+              | Call(name, _) => name
+              | _ => Message.FatalError(rule.Location, $<#Name for rule "$rule" not defined.#>)
+            }
+
+            match (name.Parts)
+            {
+              | ["_"]  => makeNameForRule(rule)
+              | [_] => name
+              | _      => assert2(false); assert(false);
+            }
+          }
+
+          NList.Map2(names, rd.GetSubRules(), makeName)
+        }
+      }
     | SpanClass             { name : NameRef; }
-
+    
     public static GetUsages() : string
     {
       def ty = typeof(this);

diff --git a/Nemerle.Parser.Macro.Model/RuleDefinition.n b/Nemerle.Parser.Macro.Model/RuleDefinition.n
@@ -12,11 +12,12 @@ namespace Nemerle.Parser.Model
   [Record]
   public variant RuleDefinition : Nemerle.Compiler.Located
   {
-    public Id : int { get; }
-    public Name : NameRef { get; }
-    public Attributes : list[RuleAttribute] { get; }
+    public Id              : int                  { get; }
+    public Name            : NameRef              { get; }
+    public Attributes      : list[RuleAttribute]  { get; }
+    public TokenFieldNames : Map[string, NameRef] { get; }
 
-    public IsAst : bool { get { Attributes.Exists(_ is RuleAttribute.Ast) } }
+    public IsAst       : bool { get { Attributes.Exists(_ is RuleAttribute.Ast) } }
     public IsExtention : bool { get { this is RuleDefinition.ExtentionPrefix || this is RuleDefinition.ExtentionPostfix } }
 
     | ExtentionPoint   { retType : RuleType; }
@@ -39,6 +40,19 @@ namespace Nemerle.Parser.Model
       }
     }
 
+    public GetSubRules() : list[Rule]
+    {
+      match (this)
+      {
+        | ExternalRule
+        | Regular
+        | ExtentionPoint         => []
+        | ExtentionPrefix as rd  => rd.rule.GetSubRules()
+        | ExtentionPostfix as rd => rd.rule.GetSubRules()
+        | Simple as rd           => rd.rule.GetSubRules()
+      }
+    }
+
     public override Equals(that : object) : bool
     {
       match (that)

diff --git a/Nemerle.Parser.Macro.Parser/GrammarParser2.n2 b/Nemerle.Parser.Macro.Parser/GrammarParser2.n2
@@ -163,6 +163,9 @@ syntax module GrammarParser2
   [Ast(                                          Span,   Class,   Name,      MatchTokens,      Semicolon)]
   syntax SpanClass              is Declaration = "span"S "class"S Identifier ("="s TokenRule)? ";"s;
 
+  [Ast(                                          Span,    Class,   Name,      Eq,  StringLiteral, Semicolon)]
+  syntax TokenField             is Declaration = "token"S "field"S Identifier "="s StringLiteral  ";"s;
+
   [Ast(                                          Brackets,   Open,     Comma, Close,    Semicolon)]
   syntax BracketPair            is Declaration = "brackets"S TokenRule ","s   TokenRule ";"s;
 

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/BindFixedType.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/BindFixedType.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     [Memoize]
     public BindFixedType(ty : PExpr) : FixedType

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineAllMethods.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineAllMethods.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public DefineAllMethods() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineAst.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineAst.n
@@ -14,7 +14,7 @@ using Nemerle.Imperative;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     [Memoize]
     public DefineAstType(rd : RuleDefinition) : TypeBuilder
@@ -47,12 +47,15 @@ namespace Nemerle.Parser
       foreach (rd when rd.IsAst in TypedGrammar.Rules)
       {
         def tb = DefineAstType(rd);
+
         match (rd.Attributes.Find(_ is RuleAttribute.Ast), GetAstFieldsTypes(rd))
         {
           | (Some(RuleAttribute.Ast as ast), None) with args = []
           | (Some(RuleAttribute.Ast as ast), Some(args)) =>
-            when (args.Length != ast.names.Length)
-              Message.Error(ast.Location, $"Expected $(args.Length) member got $(ast.names.Length)");
+            def fieldNames = ast.GetNames(rd);
+
+            when (args.Length != fieldNames.Length)
+              Message.Error(ast.Location, $"Expected $(args.Length) member got $(fieldNames.Length)");
             tb.DefineNestedType(<[decl: 
               public partial new class Error : $(tb.GetMemType() : typed)
               {
@@ -84,7 +87,8 @@ namespace Nemerle.Parser
                   {
                   }
                 ]>);
-                def members    = ast.names.Map(_.AsName).Zip(args);
+
+                def members = ast.GetNames(rd).Map(_.AsName).Zip(args);
 
                 DefineAstFields(astTb, members);
                 DefineAstCtor(astTb, members);
@@ -191,14 +195,10 @@ namespace Nemerle.Parser
           <[ { ..$exprs } ]>
       }
       def nameMap = SCG.Dictionary();
-      def rules = match (rule)
-      {
-        | Rule.Sequence(rules) =>
-          rules.Filter(rule => !(rule.Type is RuleType.Void));
-        | _ => assert(false);
-      }
-      assert(rules.Length == ast.names.Length);
-      foreach ((name, rule) in ast.names.Zip(rules))
+      def rules = rule.GetSubRules();
+      def fieldNames = ast.GetNames(rd);
+      assert(rules.Length == fieldNames.Length);
+      foreach ((name, rule) in fieldNames.Zip(rules))
         nameMap[rule.Id] = name.AsName;
       def getName(rule) : Name
       {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineDependencies.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineDependencies.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public DefineDependencies() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineDescriptors.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineDescriptors.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     [Record]
     public class TokenErrorPosition

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineGrammarRefs.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineGrammarRefs.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public DefineGrammarRefs() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineInit.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineInit.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public DefineInit() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineInterfaceMembers.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineInterfaceMembers.n
@@ -10,7 +10,7 @@ using SCG = System.Collections.Generic;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private DefineInterfaceMembers() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineLoadExtensionRules.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineLoadExtensionRules.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private DefineLoadExtensionRules() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineMember.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineMember.n
@@ -10,7 +10,7 @@ using SCG = System.Collections.Generic;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public DefineInterface(member : ClassMember) : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineParseMethods.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineParseMethods.n
@@ -11,7 +11,7 @@ using SCG = System.Collections.Generic;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private DefineParseMethods() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineParsingErrors.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineParsingErrors.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private DefineParsingErrors() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineResetMemoization.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineResetMemoization.n
@@ -12,7 +12,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private DefineResetMemoization() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineSaveState.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineSaveState.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private DefineSaveState() : void
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineSpanClasses.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/DefineSpanClasses.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private MakeSpanClassFieldName(name : NameRef) : string
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeGrammarDescriptorImpl.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeGrammarDescriptorImpl.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private MakeGrammarDescriptorImpl() : ClassMember.TypeDeclaration
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeGrammarImpl.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeGrammarImpl.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private MakeGrammarImpl() : ClassMember.TypeDeclaration
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeGrammarStateImpl.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeGrammarStateImpl.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private MakeGrammarStateImpl() : ClassMember.TypeDeclaration
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeParsingErrorsImpl.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakeParsingErrorsImpl.n
@@ -13,7 +13,7 @@ using Nemerle.Parser.Internal;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     private MakeParsingErrorsImpl() : ClassMember.TypeDeclaration
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakePublicRuleName.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CodeGeneration/MakePublicRuleName.n
@@ -11,7 +11,7 @@ using SCG = System.Collections.Generic;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public MakePublicRuleName(name : NameRef) : string
     {

diff --git a/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CompileGrammar.n b/Nemerle.Parser.Macro/Compiler/GrammarCompiler/CompileGrammar.n
@@ -11,7 +11,7 @@ using SCG = System.Collections.Generic;
 
 namespace Nemerle.Parser
 {
-  partial internal class GrammarCompiler
+  internal partial class GrammarCompiler
   {
     public CompileGrammar() : void
     {