racc 1.7.1 → 1.8.1

data/doc/en/grammar.en.rdoc

@@ -15,48 +15,47 @@ supported: Ruby style (`# ...`) and C style (`/* ... */`).
 == Class Block
 
 The class block is formed like this:
---
-class CLASS_NAME
-  [precedence table]
-  [token declarations]
-  [expected number of S/R conflict]
-  [options]
-  [semantic value conversion]
-  [start rule]
-rule
-  GRAMMARS
---
+
+  class CLASS_NAME
+    [precedence table]
+    [token declarations]
+    [expected number of S/R conflict]
+    [options]
+    [semantic value conversion]
+    [start rule]
+  rule
+    GRAMMARS
+
 CLASS_NAME is a name of parser class.
 This is the name of generating parser class.
 
 If CLASS_NAME includes '::', Racc outputs module clause.
-For example, writing "class M::C" causes creating the code bellow:
---
-module M
-  class C
-    :
-    :
+For example, writing "class M::C" causes creating the code below:
+
+  module M
+    class C
+      :
+      :
+    end
   end
-end
---
 
 == Grammar Block
 
 The grammar block describes the grammar
 to be understood by parser.  Syntax is:
---
-(token): (token) (token) (token).... (action)
 
-(token): (token) (token) (token).... (action)
-       | (token) (token) (token).... (action)
-       | (token) (token) (token).... (action)
---
+  (token): (token) (token) (token).... (action)
+
+  (token): (token) (token) (token).... (action)
+         | (token) (token) (token).... (action)
+         | (token) (token) (token).... (action)
+
 (action) is an action which is executed when its (token)s are found.
 (action) is a ruby code block, which is surrounded by braces:
---
-{ print val[0]
-  puts val[1] }
---
+
+  { print val[0]
+    puts val[1] }
+
 Note that you cannot use '%' string, here document, '%r' regexp in action.
 
 Actions can be omitted.
@@ -66,20 +65,20 @@ A return value of action is a value of left side value ($$).
 It is value of result, or returned value by "return" statement.
 
 Here is an example of whole grammar block.
---
-rule
-  goal: definition rules source { result = val }
-
-  definition: /* none */   { result = [] }
-    | definition startdesig  { result[0] = val[1] }
-    | definition
-             precrule   # this line continue from upper line
-      {
-        result[1] = val[1]
-      }
-
-  startdesig: START TOKEN
---
+
+  rule
+    goal: definition rules source { result = val }
+
+    definition: /* none */   { result = [] }
+      | definition startdesig  { result[0] = val[1] }
+      | definition
+               precrule   # this line continue from upper line
+        {
+          result[1] = val[1]
+        }
+
+    startdesig: START TOKEN
+
 You can use following special local variables in action.
 
   * result ($$)
@@ -99,45 +98,43 @@ DO NOT MODIFY this stack unless you know what you are doing.
 
 This function is equal to '%prec' in yacc.
 To designate this block:
---
-prechigh
-  nonassoc '++'
-  left     '*' '/'
-  left     '+' '-'
-  right    '='
-preclow
---
+
+  prechigh
+    nonassoc '++'
+    left     '*' '/'
+    left     '+' '-'
+    right    '='
+  preclow
+
 `right' is yacc's %right, `left' is yacc's %left.
 
 `=' + (symbol) means yacc's %prec:
---
-prechigh
-  nonassoc UMINUS
-  left '*' '/'
-  left '+' '-'
-preclow
-
-rule
-  exp: exp '*' exp
-     | exp '-' exp
-     | '-' exp       =UMINUS   # equals to "%prec UMINUS"
-         :
-         :
---
+
+  prechigh
+    nonassoc UMINUS
+    left '*' '/'
+    left '+' '-'
+  preclow
+
+  rule
+    exp: exp '*' exp
+       | exp '-' exp
+       | '-' exp       =UMINUS   # equals to "%prec UMINUS"
+           :
+           :
 
 == expect
 
 Racc supports Bison's "expect" directive to declare the expected
 number of shift/reduce conflicts.
---
-class MyParser
-rule
-  expect 3
-    :
-    :
---
-Then warnings are issued only when the effective number of conflicts differs.
 
+  class MyParser
+    expect 3
+  rule
+      :
+      :
+
+Then warnings are issued only when the effective number of conflicts differs.
 
 == Declaring Tokens
 
@@ -145,17 +142,16 @@ Declaring tokens avoids many bugs.
 
 Racc outputs warnings for declared tokens that do not exist, or existing tokens not declared.
 The syntax is:
---
-token TOKEN_NAME AND_IS_THIS
-      ALSO_THIS_IS AGAIN_AND_AGAIN THIS_IS_LAST
---
+
+  token TOKEN_NAME AND_IS_THIS
+        ALSO_THIS_IS AGAIN_AND_AGAIN THIS_IS_LAST
 
 == Options
 
 You can write options for racc command in your racc file.
---
-options OPTION OPTION ...
---
+
+  options OPTION OPTION ...
+
 Options are:
 
   * omit_action_call
@@ -179,32 +175,29 @@ Token symbols are, as default,
 
 You can change this default using a "convert" block.
 Here is an example:
---
-convert
-  PLUS 'PlusClass'      # We use PlusClass for symbol of `PLUS'
-  MIN  'MinusClass'     # We use MinusClass for symbol of `MIN'
-end
---
+
+  convert
+    PLUS 'PlusClass'      # We use PlusClass for symbol of `PLUS'
+    MIN  'MinusClass'     # We use MinusClass for symbol of `MIN'
+  end
+
 We can use almost all ruby value can be used by token symbol,
 except 'false' and 'nil'.  These are causes unexpected parse error.
 
 If you want to use String as token symbol, special care is required.
 For example:
---
-convert
-  class '"cls"'            # in code, "cls"
-  PLUS '"plus\n"'          # in code, "plus\n"
-  MIN  "\"minus#{val}\""   # in code, \"minus#{val}\"
-end
---
+
+  convert
+    class '"cls"'            # in code, "cls"
+    PLUS '"plus\n"'          # in code, "plus\n"
+    MIN  "\"minus#{val}\""   # in code, \"minus#{val}\"
+  end
 
 == Start Rule
 
 '%start' in yacc. This changes the start symbol.
---
-start real_target
---
 
+  start real_target
 
 == User Code Block
 
@@ -213,14 +206,13 @@ There are three user code blocks, "header" "inner" and "footer".
 
 User code blocks are introduced by four '-' at the beginning of a line,
 followed by a single-word name:
---
----- header
-  ruby statement
-  ruby statement
-  ruby statement
-
----- inner
-  ruby statement
-     :
-     :
---
+
+  ---- header
+    ruby statement
+    ruby statement
+    ruby statement
+
+  ---- inner
+    ruby statement
+       :
+       :

data/doc/en/grammar2.en.rdoc

@@ -127,8 +127,8 @@ Racc has bison's "expect" directive.
   # Example
 
   class MyParser
-  rule
     expect 3
+  rule
       :
       :
 

data/doc/ja/command.ja.html

@@ -6,6 +6,7 @@ racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
      [-O<var>filename</var>] [--log-file=<var>filename</var>]
      [-g] [--debug]
      [-E] [--embedded]
+     [-F] [--frozen]
      [-l] [--no-line-convert]
      [-c] [--line-convert-all]
      [-a] [--no-omit-actions]
@@ -50,6 +51,10 @@ Ruby のパスを使用します。
 ランタイムルーチンをすべて含んだコードを生成します。
 つまり、このオプションをつけて生成したコードは Ruby さえあれば動きます。
 </dd>
+<dt>-F, --frozen
+<dd>
+Add frozen_string_literals: true.
+</dd>
 <dt>-C, --check-only
 <dd>
 (文法ファイルの) 文法のチェックだけをして終了します。

data/doc/ja/grammar.ja.rdoc

@@ -173,7 +173,7 @@ target: TERM_A nonterm_a TERM_B nonterm_b
 --
 prechigh
   nonassoc PLUSPLUS
-  left     MULTI DEVIDE
+  left     MULTI DIVIDE
   left     PLUS MINUS
   right    '='
 preclow

data/doc/ja/parser.ja.rdoc

@@ -96,7 +96,7 @@ Object
     このメソッドから正常に戻った場合、パーサはエラー回復モード
     に移行します。
 
-    error_token はパースエラーを起こした記号の内部表現 (整数) です。
+    error_token_id はパースエラーを起こした記号の内部表現 (整数) です。
     #token_to_str で文法ファイル上の文字列表現に直せます。
 
     error_value はその値です。

data/ext/racc/cparse/cparse.c

@@ -22,7 +22,7 @@
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.7.1"
+#define RACC_VERSION STRINGIZE(RACC_INFO_VERSION)
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1
@@ -70,12 +70,8 @@ static ID id_d_e_pop;
 #  define LONG2NUM(i) INT2NUM(i)
 #endif
 
-#ifndef HAVE_RB_ARY_SUBSEQ
-#  define rb_ary_subseq(ary, beg, len) rb_ary_new4(len, RARRAY_PTR(ary) + beg)
-#endif
-
-static ID value_to_id _((VALUE v));
-static inline long num_to_long _((VALUE n));
+static ID value_to_id(VALUE v);
+static inline long num_to_long(VALUE n);
 
 static ID
 value_to_id(VALUE v)
@@ -99,8 +95,8 @@ num_to_long(VALUE n)
                         Parser Stack Interfaces
 ----------------------------------------------------------------------- */
 
-static VALUE get_stack_tail _((VALUE stack, long len));
-static void cut_stack_tail _((VALUE stack, long len));
+static VALUE get_stack_tail(VALUE stack, long len);
+static void cut_stack_tail(VALUE stack, long len);
 
 static VALUE
 get_stack_tail(VALUE stack, long len)
@@ -189,27 +185,27 @@ struct cparse_params {
                         Parser Main Routines
 ----------------------------------------------------------------------- */
 
-static VALUE racc_cparse _((VALUE parser, VALUE arg, VALUE sysdebug));
-static VALUE racc_yyparse _((VALUE parser, VALUE lexer, VALUE lexmid,
-                             VALUE arg, VALUE sysdebug));
-
-static void call_lexer _((struct cparse_params *v));
-static VALUE lexer_i _((RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data)));
-
-static VALUE assert_array _((VALUE a));
-static long assert_integer _((VALUE n));
-static VALUE assert_hash _((VALUE h));
-static VALUE initialize_params _((VALUE vparams, VALUE parser, VALUE arg,
-                                 VALUE lexer, VALUE lexmid));
-static void cparse_params_mark _((void *ptr));
-static size_t cparse_params_memsize _((const void *ptr));
-
-static void parse_main _((struct cparse_params *v,
-                         VALUE tok, VALUE val, int resume));
-static void extract_user_token _((struct cparse_params *v,
-                                  VALUE block_args, VALUE *tok, VALUE *val));
-static void shift _((struct cparse_params* v, long act, VALUE tok, VALUE val));
-static int reduce _((struct cparse_params* v, long act));
+static VALUE racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug);
+static VALUE racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid,
+			  VALUE arg, VALUE sysdebug);
+
+static void call_lexer(struct cparse_params *v);
+static VALUE lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data));
+
+static VALUE assert_array(VALUE a);
+static long assert_integer(VALUE n);
+static VALUE assert_hash(VALUE h);
+static VALUE initialize_params(VALUE vparams, VALUE parser, VALUE arg,
+			       VALUE lexer, VALUE lexmid);
+static void cparse_params_mark(void *ptr);
+static size_t cparse_params_memsize(const void *ptr);
+
+static void parse_main(struct cparse_params *v,
+		       VALUE tok, VALUE val, int resume);
+static void extract_user_token(struct cparse_params *v,
+			       VALUE block_args, VALUE *tok, VALUE *val);
+static void shift(struct cparse_params* v, long act, VALUE tok, VALUE val);
+static int reduce(struct cparse_params* v, long act);
 static rb_block_call_func reduce0;
 
 #ifdef DEBUG
@@ -278,28 +274,11 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
     return v->retval;
 }
 
-#ifdef HAVE_RB_BLOCK_CALL
 static void
 call_lexer(struct cparse_params *v)
 {
     rb_block_call(v->lexer, v->lexmid, 0, NULL, lexer_i, v->value_v);
 }
-#else
-static VALUE
-lexer_iter(VALUE data)
-{
-    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
-
-    rb_funcall(v->lexer, v->lexmid, 0);
-    return Qnil;
-}
-
-static void
-call_lexer(struct cparse_params *v)
-{
-    rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v);
-}
-#endif
 
 static VALUE
 lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data))

data/ext/racc/cparse/extconf.rb

@@ -1,9 +1,8 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 
 require 'mkmf'
+require_relative '../../../lib/racc/info'
 
-have_func('rb_block_call')
-have_func('rb_ary_subseq')
-
+$defs << "-D""RACC_INFO_VERSION=#{Racc::VERSION}"
 create_makefile 'racc/cparse'

data/lib/racc/grammar.rb

@@ -10,11 +10,11 @@
 #
 #++
 
-require 'racc/compat'
-require 'racc/iset'
-require 'racc/sourcetext'
-require 'racc/logfilegenerator'
-require 'racc/exception'
+require_relative 'compat'
+require_relative 'iset'
+require_relative 'sourcetext'
+require_relative 'logfilegenerator'
+require_relative 'exception'
 require 'forwardable'
 
 module Racc
@@ -27,6 +27,7 @@ module Racc
       @rules   = []  # :: [Rule]
       @start   = nil
       @n_expected_srconflicts = nil
+      @error_on_expect_mismatch = nil
       @prec_table = []
       @prec_table_closed = false
       @closed = false
@@ -36,6 +37,7 @@ module Racc
     attr_reader :start
     attr_reader :symboltable
     attr_accessor :n_expected_srconflicts
+    attr_accessor :error_on_expect_mismatch
 
     def [](x)
       @rules[x]
@@ -787,6 +789,81 @@ module Racc
   end
 
 
+  class OptionMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '?'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class ManyMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '*'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class Many1Mark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '+'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class GroupStartMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '('
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class GroupEndMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      ')'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
   class Prec
     def initialize(symbol, lineno)
       @symbol = symbol