build.gradle

@@ -107,12 +107,18 @@ jastadd {
             }
 
             scanner {
-                include "src/main/jastadd/RelAst.flex"
+                include "src/main/jastadd/scanner/Header.flex",         [-4]
+                include "src/main/jastadd/scanner/Preamble.flex",       [-3]
+                include "src/main/jastadd/scanner/Macros.flex",         [-2]
+                include "src/main/jastadd/scanner/RulesPreamble.flex",  [-1]
+                include "src/main/jastadd/scanner/Keywords.flex",       [0]
+                include "src/main/jastadd/scanner/Symbols.flex",        [1]
+                include "src/main/jastadd/scanner/RulesPostamble.flex", [2]
             }
 
             parser {
-                include "src/main/jastadd/Preamble.parser"
-                include "src/main/jastadd/RelAst.parser"
+                include "src/main/jastadd/parser/Preamble.parser"
+                include "src/main/jastadd/parser/RelAst.parser"
             }
         }
     }

src/main/jastadd/scanner/Header.flex

+package org.jastadd.relast.scanner;
+
+import org.jastadd.relast.parser.RelAstParser.Terminals;
+%%
+
+%public
+%final
+%class RelAstScanner
+%extends beaver.Scanner
+
+%type beaver.Symbol
+%function nextToken
+%yylexthrow beaver.Scanner.Exception
+%scanerror RelAstScanner.ScannerError
+
+%line
+%column

src/main/jastadd/scanner/Keywords.flex

+"abstract"   { return sym(Terminals.ABSTRACT); }
+"rel"        { return sym(Terminals.RELATION); }

src/main/jastadd/scanner/Macros.flex

+WhiteSpace = [ ] | \t | \f | \n | \r | \r\n
+ID = [a-zA-Z$_][a-zA-Z0-9$_]*
+TraditionalComment   = [/][*][^*]*[*]+([^*/][^*]*[*]+)*[/]
+EndOfLineComment = "//" [^\n\r]*
+Comment = {TraditionalComment} | {EndOfLineComment}

src/main/jastadd/scanner/Preamble.flex

+%{
+  private StringBuilder stringLitSb = new StringBuilder();
+
+  private beaver.Symbol sym(short id) {
+    return new beaver.Symbol(id, yyline + 1, yycolumn + 1, yylength(), yytext());
+  }
+
+  private beaver.Symbol sym(short id, String text) {
+    return new beaver.Symbol(id, yyline + 1, yycolumn + 1, yylength(), text);
+  }
+
+
+  public static class ScannerError extends Error {
+    public ScannerError(String message) {
+      super(message);
+    }
+  }
+%}

src/main/jastadd/scanner/RulesPostamble.flex

+{ID}         { return sym(Terminals.ID); }
+<<EOF>>      { return sym(Terminals.EOF); }
+
+[^]            { throw new ScannerError((yyline+1) +"," + (yycolumn+1) + ": Illegal character <"+yytext()+">"); }

src/main/jastadd/scanner/RulesPreamble.flex

+
+%%
+
+{WhiteSpace} { /* ignore */ }
+{Comment}    { return sym(Terminals.COMMENT); }

src/main/jastadd/RelAst.flex → src/main/jastadd/scanner/Symbols.flex

-package org.jastadd.relast.scanner;
-
-import org.jastadd.relast.parser.RelAstParser.Terminals;
-
-%%
-
-%public
-%final
-%class RelAstScanner
-%extends beaver.Scanner
-
-%type beaver.Symbol
-%function nextToken
-%yylexthrow beaver.Scanner.Exception
-%scanerror RelAstScanner.ScannerError
-
-%line
-%column
-%{
-  private StringBuilder stringLitSb = new StringBuilder();
-
-  private beaver.Symbol sym(short id) {
-    return new beaver.Symbol(id, yyline + 1, yycolumn + 1, yylength(), yytext());
-  }
-
-  private beaver.Symbol sym(short id, String text) {
-    return new beaver.Symbol(id, yyline + 1, yycolumn + 1, yylength(), text);
-  }
-
-
-  public static class ScannerError extends Error {
-    public ScannerError(String message) {
-      super(message);
-    }
-  }
-%}
-
-WhiteSpace = [ ] | \t | \f | \n | \r | \r\n
-TraditionalComment   = [/][*][^*]*[*]+([^*/][^*]*[*]+)*[/]
-EndOfLineComment = "//" [^\n\r]*
-Comment = {TraditionalComment} | {EndOfLineComment}
-
-ID = [a-zA-Z$_][a-zA-Z0-9$_]*
-
-%%
-{WhiteSpace} { /* ignore */ }
-{Comment}    { return sym(Terminals.COMMENT); }
-
-"abstract"   { return sym(Terminals.ABSTRACT); }
-"rel"        { return sym(Terminals.RELATION); }
-
 ";"          { return sym(Terminals.SCOL); }
 ":"          { return sym(Terminals.COL); }
 "::="        { return sym(Terminals.ASSIGN); }
@@ -64,9 +13,3 @@ ID = [a-zA-Z$_][a-zA-Z0-9$_]*
 "->"         { return sym(Terminals.RIGHT); }
 "<-"         { return sym(Terminals.LEFT); }
 "<->"        { return sym(Terminals.BIDIRECTIONAL); }
-
-// ID
-{ID}         { return sym(Terminals.ID); }
-<<EOF>>      { return sym(Terminals.EOF); }
-
-[^]            { throw new ScannerError((yyline+1) +"," + (yycolumn+1) + ": Illegal character <"+yytext()+">"); }