lrama 0.5.5 → 0.5.7

data/lib/lrama/version.rb

@@ -1,3 +1,3 @@
 module Lrama
-  VERSION = "0.5.5".freeze
+  VERSION = "0.5.7".freeze
 end

data/lib/lrama.rb

@@ -5,6 +5,8 @@ require "lrama/counterexamples"
 require "lrama/digraph"
 require "lrama/grammar"
 require "lrama/lexer"
+require "lrama/option_parser"
+require "lrama/options"
 require "lrama/output"
 require "lrama/parser"
 require "lrama/report"

data/parser.y

@@ -0,0 +1,416 @@
+class Lrama::Parser
+rule
+  input: prologue_declarations bison_declarations "%%" grammar epilogue_opt
+
+  prologue_declarations: # empty
+                       | prologue_declarations prologue_declaration
+
+  prologue_declaration: "%{"
+                          {
+                            @lexer.status = :c_declaration
+                            @lexer.end_symbol = '%}'
+                            @grammar.prologue_first_lineno = @lexer.line
+                          }
+                        C_DECLARATION
+                          {
+                            @lexer.status = :initial
+                            @lexer.end_symbol = nil
+                          }
+                        "%}"
+                          {
+                            @grammar.prologue = val[2].s_value
+                          }
+                      | "%require" STRING
+
+  bison_declarations: /* empty */ { result = "" }
+                    | bison_declarations bison_declaration
+
+  bison_declaration: grammar_declaration
+                   | "%expect" INTEGER { @grammar.expect = val[1] }
+                   | "%define" variable value
+                   | "%require" STRING
+                   | "%param" params
+                   | "%lex-param" params
+                       {
+                         val[1].each {|token|
+                           token.references = []
+                           @grammar.lex_param = @grammar.build_code(:lex_param, token).token_code.s_value
+                         }
+                       }
+                   | "%parse-param" params
+                       {
+                         val[1].each {|token|
+                           token.references = []
+                           @grammar.parse_param = @grammar.build_code(:parse_param, token).token_code.s_value
+                         }
+                       }
+                   | "%initial-action" "{"
+                       {
+                         @lexer.status = :c_declaration
+                         @lexer.end_symbol = '}'
+                       }
+                     C_DECLARATION
+                       {
+                         @lexer.status = :initial
+                         @lexer.end_symbol = nil
+                       }
+                     "}"
+                       {
+                         @grammar.initial_action = @grammar.build_code(:initial_action, val[3])
+                       }
+                   | ";"
+
+  grammar_declaration: "%union" "{"
+                         {
+                           @lexer.status = :c_declaration
+                           @lexer.end_symbol = '}'
+                         }
+                       C_DECLARATION
+                         {
+                           @lexer.status = :initial
+                           @lexer.end_symbol = nil
+                         }
+                       "}"
+                         {
+                           @grammar.set_union(@grammar.build_code(:union, val[3]), val[3].line)
+                         }
+                     | symbol_declaration
+                     | "%destructor" "{"
+                         {
+                           @lexer.status = :c_declaration
+                           @lexer.end_symbol = '}'
+                         }
+                       C_DECLARATION
+                         {
+                           @lexer.status = :initial
+                           @lexer.end_symbol = nil
+                         }
+                         "}" generic_symlist
+                     | "%printer" "{"
+                         {
+                           @lexer.status = :c_declaration
+                           @lexer.end_symbol = '}'
+                         }
+                       C_DECLARATION
+                         {
+                           @lexer.status = :initial
+                           @lexer.end_symbol = nil
+                         }
+                       "}" generic_symlist
+                         {
+                           @grammar.add_printer(ident_or_tags: val[6], code: @grammar.build_code(:printer, val[3]), lineno: val[3].line)
+                         }
+                     | "%error-token" "{"
+                         {
+                           @lexer.status = :c_declaration
+                           @lexer.end_symbol = '}'
+                         }
+                       C_DECLARATION
+                         {
+                           @lexer.status = :initial
+                           @lexer.end_symbol = nil
+                         }
+                       "}" generic_symlist
+                         {
+                           @grammar.add_error_token(ident_or_tags: val[6], code: @grammar.build_code(:error_token, val[3]), lineno: val[3].line)
+                         }
+
+  symbol_declaration: "%token" token_declarations
+                    | "%type" symbol_declarations
+                        {
+                          val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              @grammar.add_type(id: id, tag: hash[:tag])
+                            }
+                          }
+                        }
+                    | "%left" token_declarations_for_precedence
+                        {
+                          val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_left(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+                        }
+                    | "%right" token_declarations_for_precedence
+                        {
+                          val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_right(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+                        }
+                    | "%precedence" token_declarations_for_precedence
+                        {
+                          val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_precedence(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+                        }
+                    | "%nonassoc" token_declarations_for_precedence
+                        {
+                          val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_nonassoc(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+                        }
+
+  token_declarations: token_declaration_list
+                        {
+                          val[0].each {|token_declaration|
+                            @grammar.add_term(id: token_declaration[0], alias_name: token_declaration[2], token_id: token_declaration[1], tag: nil, replace: true)
+                          }
+                        }
+                    | TAG token_declaration_list
+                        {
+                          val[1].each {|token_declaration|
+                            @grammar.add_term(id: token_declaration[0], alias_name: token_declaration[2], token_id: token_declaration[1], tag: val[0], replace: true)
+                          }
+                        }
+                    | token_declarations TAG token_declaration_list
+                        {
+                          val[2].each {|token_declaration|
+                            @grammar.add_term(id: token_declaration[0], alias_name: token_declaration[2], token_id: token_declaration[1], tag: val[1], replace: true)
+                          }
+                        }
+
+  token_declaration_list: token_declaration { result = [val[0]] }
+                        | token_declaration_list token_declaration { result = val[0].append(val[1]) }
+
+  token_declaration: id int_opt alias { result = val }
+
+  int_opt: # empty
+         | INTEGER
+
+  alias: # empty
+       | STRING # TODO: change this to string_as_id
+
+  symbol_declarations: symbol_declaration_list
+                         {
+                           result = [{tag: nil, tokens: val[0]}]
+                         }
+                     | TAG symbol_declaration_list
+                         {
+                           result = [{tag: val[0], tokens: val[1]}]
+                         }
+                     | symbol_declarations TAG symbol_declaration_list
+                       {
+                         result = val[0].append({tag: val[1], tokens: val[2]})
+                       }
+
+  symbol_declaration_list: symbol { result = [val[0]] }
+                         | symbol_declaration_list symbol { result = val[0].append(val[1]) }
+
+  symbol: id
+        | string_as_id
+
+  params: params "{"
+            {
+              @lexer.status = :c_declaration
+              @lexer.end_symbol = '}'
+            }
+          C_DECLARATION
+            {
+              @lexer.status = :initial
+              @lexer.end_symbol = nil
+            }
+          "}"
+            {
+              result = val[0].append(val[3])
+            }
+        | "{"
+            {
+              @lexer.status = :c_declaration
+              @lexer.end_symbol = '}'
+            }
+          C_DECLARATION
+            {
+              @lexer.status = :initial
+              @lexer.end_symbol = nil
+            }
+          "}"
+            {
+              result = [val[2]]
+            }
+
+  token_declarations_for_precedence: token_declaration_list_for_precedence
+                                       {
+                                         result = [{tag: nil, tokens: val[0]}]
+                                       }
+                                   | TAG token_declaration_list_for_precedence
+                                       {
+                                         result = [{tag: val[0], tokens: val[1]}]
+                                       }
+                                   | token_declarations_for_precedence token_declaration_list_for_precedence
+                                       {
+                                         result = val[0].append({tag: nil, tokens: val[1]})
+                                       }
+
+  token_declaration_list_for_precedence: token_declaration_for_precedence { result = [val[0]] }
+                                       | token_declaration_list_for_precedence token_declaration_for_precedence { result = val[0].append(val[1]) }
+
+  token_declaration_for_precedence: id
+
+  id: IDENTIFIER { raise "Ident after %prec" if @prec_seen }
+    | CHARACTER { raise "Char after %prec" if @prec_seen }
+
+  grammar: rules_or_grammar_declaration
+         | grammar rules_or_grammar_declaration
+
+  rules_or_grammar_declaration: rules
+                              | grammar_declaration ";"
+
+  rules: id_colon named_ref_opt ":" rhs_list
+           {
+             lhs = val[0]
+             lhs.alias = val[1]
+             val[3].each {|hash|
+               @grammar.add_rule(lhs: lhs, rhs: hash[:rhs], lineno: hash[:lineno])
+             }
+           }
+
+  rhs_list: rhs
+              {
+                result = [{rhs: val[0], lineno: val[0].first&.line || @lexer.line - 1}]
+              }
+          | rhs_list "|" rhs
+              {
+                result = val[0].append({rhs: val[2], lineno: val[2].first&.line || @lexer.line - 1})
+              }
+          | rhs_list ";"
+
+  rhs: /* empty */
+         {
+           result = []
+           @prec_seen = false
+           @code_after_prec = false
+         }
+     | rhs symbol named_ref_opt
+         {
+           token = val[1]
+           val[1].alias = val[2]
+           result = val[0].append(token)
+         }
+     | rhs "{"
+         {
+           if @prec_seen
+             raise "Multiple User_code after %prec" if @code_after_prec
+             @code_after_prec = true
+           end
+           @lexer.status = :c_declaration
+           @lexer.end_symbol = '}'
+         }
+       C_DECLARATION
+         {
+           @lexer.status = :initial
+           @lexer.end_symbol = nil
+         }
+       "}" named_ref_opt
+         {
+           token = val[3]
+           token.alias = val[6]
+           result = val[0].append(token)
+         }
+     | "{"
+         {
+           if @prec_seen
+             raise "Multiple User_code after %prec" if @code_after_prec
+             @code_after_prec = true
+           end
+           @lexer.status = :c_declaration
+           @lexer.end_symbol = '}'
+         }
+       C_DECLARATION
+         {
+           @lexer.status = :initial
+           @lexer.end_symbol = nil
+         }
+       "}" named_ref_opt
+         {
+           token = val[2]
+           token.alias = val[5]
+           result = [token]
+         }
+     | rhs "%prec" symbol
+         {
+           sym = @grammar.find_symbol_by_id!(val[2])
+           result = val[0].append(sym)
+           @prec_seen = true
+         }
+
+  named_ref_opt: # empty
+               | '[' IDENTIFIER ']' { result = val[1].s_value }
+
+  id_colon: IDENT_COLON
+
+  epilogue_opt: # empty
+              | "%%"
+                  {
+                    @lexer.status = :c_declaration
+                    @lexer.end_symbol = '\Z'
+                    @grammar.epilogue_first_lineno = @lexer.line + 1
+                  }
+                C_DECLARATION
+                  {
+                    @lexer.status = :initial
+                    @lexer.end_symbol = nil
+                    @grammar.epilogue = val[2].s_value
+                  }
+
+  variable: id
+
+  value: # empty
+       | IDENTIFIER
+       | STRING
+       | "{...}"
+
+  generic_symlist: generic_symlist_item { result = [val[0]] }
+                 | generic_symlist generic_symlist_item { result = val[0].append(val[1]) }
+
+  generic_symlist_item: symbol
+                      | TAG
+
+  string_as_id: STRING { result = Lrama::Lexer::Token.new(type: Lrama::Lexer::Token::Ident, s_value: val[0]) }
+end
+
+---- inner
+
+include Lrama::Report::Duration
+
+def initialize(text)
+  @text = text
+end
+
+def parse
+  report_duration(:parse) do
+    @lexer = Lrama::Lexer.new(@text)
+    @grammar = Lrama::Grammar.new
+    @precedence_number = 0
+    do_parse
+    @grammar.extract_references
+    @grammar.prepare
+    @grammar.compute_nullable
+    @grammar.compute_first_set
+    @grammar.validate!
+    @grammar
+  end
+end
+
+def next_token
+  @lexer.next_token
+end
+
+def on_error(error_token_id, error_value, value_stack)
+  raise ParseError, sprintf("\n%d:%d: parse error on value %s (%s)",
+                            @lexer.line, @lexer.column, error_value.inspect, token_to_str(error_token_id) || '?')
+end

data/rbs_collection.lock.yaml

@@ -2,7 +2,7 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: 28208148c7e64a25e9b86b9723b4c3a2cef14e81
+  revision: 95ad664324500c9eec78569b45da98c65a27a511
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"

data/sample/calc.y

@@ -16,8 +16,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "calc.h"
-
 static int yylex(YYSTYPE *val, YYLTYPE *loc);
 static int yyerror(YYLTYPE *loc, const char *str);
 %}

data/sample/parse.y

@@ -4,9 +4,6 @@
 
 %{
 // Prologue
-
-#include "y.tab.h"
-
 static enum yytokentype yylex(YYSTYPE *lval, YYLTYPE *yylloc);
 static void yyerror(YYLTYPE *yylloc, const char *msg);
 

data/sig/lrama/digraph.rbs

@@ -0,0 +1,23 @@
+module Lrama
+  class Digraph
+    def initialize: (Array[Integer] sets, Hash[Integer, Array[Integer]] relation, Hash[Integer, Integer] base_function) -> void
+    # X in the paper
+    @sets: Array[Integer]
+    # R in the paper
+    @relation: Hash[Integer, Array[Integer]]
+    # F' in the paper
+    @base_function: Hash[Integer, Integer]
+    # S in the paper
+    @stack: Array[Integer]
+    # N in the paper
+    @h: Hash[Integer, (Integer|Float)?]
+    # F in the paper
+    @result: Hash[Integer, Integer]
+
+    def compute: () -> Hash[Integer, Integer]
+
+    private
+
+    def traverse: (Integer x) -> void
+  end
+end

data/sig/lrama/lexer/token/type.rbs

@@ -0,0 +1,17 @@
+module Lrama
+  class Lexer
+    class Token
+      attr_accessor type: Type
+      attr_accessor s_value: String
+      attr_accessor alias: String
+
+      def initialize: (?type: Type, ?s_value: String, ?alias: String) -> void
+      class Type
+        attr_accessor id: Integer
+        attr_accessor name: String
+
+        def initialize: (?id: Integer, ?name: String) -> void
+      end
+    end
+  end
+end

data/template/bison/_yacc.h

@@ -0,0 +1,71 @@
+<%# b4_shared_declarations -%>
+  <%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
+    <%- if output.spec_mapped_header_file -%>
+#ifndef <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
+# define <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
+    <%- end -%>
+  <%-# b4_declare_yydebug & b4_YYDEBUG_define -%>
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG && !defined(yydebug)
+extern int yydebug;
+#endif
+  <%-# b4_percent_code_get([[requires]]). %code is not supported -%>
+
+  <%-# b4_token_enums_defines -%>
+/* Token kinds.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+<%= output.token_enums -%>
+  };
+  typedef enum yytokentype yytoken_kind_t;
+#endif
+
+  <%-# b4_declare_yylstype -%>
+    <%-# b4_value_type_define -%>
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+union YYSTYPE
+{
+#line <%= output.grammar.union.lineno %> "<%= output.grammar_file_path %>"
+<%= output.grammar.union.braces_less_code %>
+#line [@oline@] [@ofile@]
+
+};
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+    <%-# b4_location_type_define -%>
+/* Location type.  */
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
+typedef struct YYLTYPE YYLTYPE;
+struct YYLTYPE
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+};
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+
+  <%-# b4_declare_yyerror_and_yylex. Not supported -%>
+  <%-# b4_declare_yyparse -%>
+int yyparse (<%= output.parse_param %>);
+
+
+  <%-# b4_percent_code_get([[provides]]). %code is not supported -%>
+  <%-# b4_cpp_guard_close([b4_spec_mapped_header_file]) -%>
+    <%- if output.spec_mapped_header_file -%>
+#endif /* !<%= output.b4_cpp_guard__b4_spec_mapped_header_file %>  */
+    <%- end -%>

data/template/bison/yacc.c

@@ -101,79 +101,13 @@
 # endif
 
 <%# b4_header_include_if -%>
+<%- if output.include_header -%>
+#include "<%= output.include_header %>"
+<%- else -%>
 /* Use api.header.include to #include this header
    instead of duplicating it here.  */
-<%# b4_shared_declarations -%>
-  <%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
-    <%- if output.spec_mapped_header_file -%>
-#ifndef <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
-# define <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
-    <%- end -%>
-  <%-# b4_declare_yydebug & b4_YYDEBUG_define -%>
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG && !defined(yydebug)
-extern int yydebug;
-#endif
-  <%-# b4_percent_code_get([[requires]]). %code is not supported -%>
-
-  <%-# b4_token_enums_defines -%>
-/* Token kinds.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-<%= output.token_enums -%>
-  };
-  typedef enum yytokentype yytoken_kind_t;
-#endif
-
-  <%-# b4_declare_yylstype -%>
-    <%-# b4_value_type_define -%>
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-union YYSTYPE
-{
-#line <%= output.grammar.union.lineno %> "<%= output.grammar_file_path %>"
-<%= output.grammar.union.braces_less_code %>
-#line [@oline@] [@ofile@]
-
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-    <%-# b4_location_type_define -%>
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-  <%-# b4_declare_yyerror_and_yylex. Not supported -%>
-  <%-# b4_declare_yyparse -%>
-int yyparse (<%= output.parse_param %>);
-
-
-  <%-# b4_percent_code_get([[provides]]). %code is not supported -%>
-  <%-# b4_cpp_guard_close([b4_spec_mapped_header_file]) -%>
-    <%- if output.spec_mapped_header_file -%>
-#endif /* !<%= output.b4_cpp_guard__b4_spec_mapped_header_file %>  */
-    <%- end -%>
+<%= output.render_partial("bison/_yacc.h") %>
+<%- end -%>
 <%# b4_declare_symbol_enum -%>
 /* Symbol kind.  */
 enum yysymbol_kind_t
@@ -2114,3 +2048,4 @@ yyreturnlab:
 #line <%= output.aux.epilogue_first_lineno - 1 %> "<%= output.grammar_file_path %>"
 
 <%= output.aux.epilogue -%>
+