move BNF and EBNF parsers in their own namespace

b3b00 · Jul 30, 2024 · edb4d01 · edb4d01
1 parent bba2730
commit edb4d01
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 21 deletions.
diff --git a/src/sly/parser/generator/EBNFParserBuilder.cs b/src/sly/parser/generator/EBNFParserBuilder.cs
@@ -7,7 +7,8 @@
 using sly.lexer;
 using sly.lexer.fsm;
 using sly.parser.generator.visitor;
-using sly.parser.llparser;
+using sly.parser.llparser.bnf;
+using sly.parser.llparser.ebnf;
 using sly.parser.syntax.grammar;
 
 namespace sly.parser.generator

diff --git a/src/sly/parser/generator/ParserBuilder.cs b/src/sly/parser/generator/ParserBuilder.cs
@@ -8,7 +8,7 @@
 using sly.lexer;
 using sly.lexer.fsm;
 using sly.parser.generator.visitor;
-using sly.parser.llparser;
+using sly.parser.llparser.bnf;
 using sly.parser.parser;
 using sly.parser.syntax.grammar;
 

diff --git a/src/sly/parser/parser/Parser.cs b/src/sly/parser/parser/Parser.cs
@@ -6,7 +6,8 @@
 using sly.lexer;
 using sly.parser.generator;
 using sly.parser.generator.visitor;
-using sly.parser.llparser;
+using sly.parser.llparser.bnf;
+using sly.parser.llparser.ebnf;
 using sly.parser.parser;
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;

diff --git a/src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.Expressions.cs b/src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.Expressions.cs
@@ -2,9 +2,9 @@
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.bnf;
 
-public partial class RecursiveDescentSyntaxParser<IN, OUT>
+public partial class RecursiveDescentSyntaxParser<IN, OUT> where IN : struct
 {
 
             protected SyntaxNode<IN> ManageExpressionRules(Rule<IN> rule, SyntaxNode<IN> node)

diff --git a/src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.NonTerminal.cs b/src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.NonTerminal.cs
@@ -2,9 +2,9 @@
 using sly.lexer;
 using sly.parser.syntax.grammar;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.bnf;
 
-public partial class RecursiveDescentSyntaxParser<IN, OUT>
+public partial class RecursiveDescentSyntaxParser<IN, OUT> where IN : struct
 {
     #region parsing
 

diff --git a/src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.Terminal.cs b/src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.Terminal.cs
@@ -3,9 +3,9 @@
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.bnf;
 
-public partial class RecursiveDescentSyntaxParser<IN, OUT>
+public partial class RecursiveDescentSyntaxParser<IN, OUT> where IN : struct
 {
     #region parsing
 

diff --git a/.../llparser/RecursiveDescentSyntaxParser.cs → ...arser/bnf/RecursiveDescentSyntaxParser.cs b/.../llparser/RecursiveDescentSyntaxParser.cs → ...arser/bnf/RecursiveDescentSyntaxParser.cs
@@ -5,7 +5,7 @@
 using sly.parser.syntax.tree;
 using System.Linq;
 
-namespace sly.parser.llparser
+namespace sly.parser.llparser.bnf
 {
     public partial class RecursiveDescentSyntaxParser<IN, OUT> where IN : struct
     {

diff --git a/...er/RecursiveDescentSyntaxParserStarter.cs → ...nf/RecursiveDescentSyntaxParserStarter.cs b/...er/RecursiveDescentSyntaxParserStarter.cs → ...nf/RecursiveDescentSyntaxParserStarter.cs
@@ -3,7 +3,7 @@
 using sly.parser.generator;
 using sly.parser.syntax.grammar;
 
-namespace sly.parser.llparser
+namespace sly.parser.llparser.bnf
 {
     public partial class RecursiveDescentSyntaxParser<IN, OUT> : ISyntaxParser<IN, OUT> where IN : struct
     {

diff --git a/...llparser/ebnf/EBNFRecursiveDescentSyntaxParser.EBNFRecursiveDescentSyntaxParser.Choice.cs b/...llparser/ebnf/EBNFRecursiveDescentSyntaxParser.EBNFRecursiveDescentSyntaxParser.Choice.cs
@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using sly.lexer;
+using sly.parser;
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.ebnf;
 
-public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT>
+public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT> where IN : struct
 {
     #region parsing
 

diff --git a/src/sly/parser/parser/llparser/ebnf/EBNFRecursiveDescentSyntaxParser.Expressions.cs b/src/sly/parser/parser/llparser/ebnf/EBNFRecursiveDescentSyntaxParser.Expressions.cs
@@ -1,9 +1,10 @@
 using System.Collections.Generic;
 using sly.lexer;
+using sly.parser;
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.ebnf;
 
 public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT>
 {

diff --git a/src/sly/parser/parser/llparser/ebnf/EBNFRecursiveDescentSyntaxParser.Many.cs b/src/sly/parser/parser/llparser/ebnf/EBNFRecursiveDescentSyntaxParser.Many.cs
@@ -4,9 +4,9 @@
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.ebnf;
 
-public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT>
+public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT> where IN : struct
 {
     #region parsing
 

diff --git a/src/sly/parser/parser/llparser/ebnf/EBNFRecursiveDescentSyntaxParser.Option.cs b/src/sly/parser/parser/llparser/ebnf/EBNFRecursiveDescentSyntaxParser.Option.cs
@@ -4,9 +4,9 @@
 using sly.parser.syntax.grammar;
 using sly.parser.syntax.tree;
 
-namespace sly.parser.llparser;
+namespace sly.parser.llparser.ebnf;
 
-public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT>
+public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT> where IN : struct
 {
     #region parsing
 

diff --git a/...arser/EBNFRecursiveDescentSyntaxParser.cs → .../ebnf/EBNFRecursiveDescentSyntaxParser.cs b/...arser/EBNFRecursiveDescentSyntaxParser.cs → .../ebnf/EBNFRecursiveDescentSyntaxParser.cs
@@ -5,8 +5,9 @@
 using sly.parser.generator;
 using sly.parser.syntax.tree;
 using sly.parser.syntax.grammar;
+using sly.parser.llparser.bnf;
 
-namespace sly.parser.llparser
+namespace sly.parser.llparser.ebnf
 {
     public partial  class EBNFRecursiveDescentSyntaxParser<IN, OUT> : RecursiveDescentSyntaxParser<IN, OUT> where IN : struct
     {

diff --git a/...BNFRecursiveDescentSyntaxParserStarter.cs → ...BNFRecursiveDescentSyntaxParserStarter.cs b/...BNFRecursiveDescentSyntaxParserStarter.cs → ...BNFRecursiveDescentSyntaxParserStarter.cs
@@ -2,8 +2,9 @@
 using System.Linq;
 using sly.parser.generator;
 using sly.parser.syntax.grammar;
+using sly.parser.llparser.bnf;
 
-namespace sly.parser.llparser
+namespace sly.parser.llparser.ebnf
 {
     public partial class EBNFRecursiveDescentSyntaxParser<IN, OUT> where IN : struct
     {

diff --git a/tests/ParserTests/EBNFTests.cs b/tests/ParserTests/EBNFTests.cs
@@ -12,7 +12,7 @@
 using sly.lexer;
 using sly.parser;
 using sly.parser.generator;
-using sly.parser.llparser;
+using sly.parser.llparser.ebnf;
 using sly.parser.parser;
 using sly.parser.syntax.grammar;
 using Xunit;