racc 1.6.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f818fe943a0bd022e4bc6d58e4c014ecd53fabef972ae98822b155b8d3c24b0
-  data.tar.gz: 649c807b04a435eff16318026ee39d4fa24d3422afc2ffe38fdc0737eb1c30eb
+  metadata.gz: 5de182ad74eb075783ee57ec9f930c2d81a4d1465db436f6d5e42fb96eaa6a0f
+  data.tar.gz: 53cb977c27837bdf4df9cd1eae679e30a00ecb07b080e8481b59bfb66aec8bf8
 SHA512:
-  metadata.gz: db8d75ac8360c95552ecffd24eaa96e1f2252771fd715a8fed8f2fcfca7d8bfb3e51211089d05464ff42eacac7a063944cfe64fce571ccb6e4eca84e6391a5de
-  data.tar.gz: '04971d555f03bfd242a4f5d75d810c5917d528b647e60fa8197d472aa9b1d3cf44b318406730e3a87427f4adad6c37b1b8427174e3480efaf237f97dc5fbac6e'
+  metadata.gz: cf79f910341f5fa146fb6f798ebfa08ad3e0379b1f322e80a004ea1b1285c4ce8bfa239f59cc078eb152d020a012d5d4f0646e2ad16a3ad55665db7d9521be1e
+  data.tar.gz: a317170a03d5355324b1d35cecc0edcd06fd4622eee4dd5cbc48ec0c4d53631054b37798f65b90ba0b4eabce1eb281e172554139854b63bad7bc3b8bdef3b811

data/ChangeLog

@@ -253,7 +253,7 @@ Mon Jul  3 04:34:32 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/racc/grammar.rb: class RuleTable -> Grammar.
 
-	* lib/racc/grammar.rb: Grammar.new does not acccept a Compiler.
+	* lib/racc/grammar.rb: Grammar.new does not accept a Compiler.
 
 	* lib/racc/grammar.rb: refactoring.
 
@@ -285,7 +285,7 @@ Mon Jul  3 04:34:32 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/racc/state.rb: class StateTable -> States.
 
-	* lib/racc/state.rb: States.new does not acccept a Compiler.
+	* lib/racc/state.rb: States.new does not accept a Compiler.
 
 	* lib/racc/state.rb: refactoring.
 
@@ -418,7 +418,7 @@ Tue Jul 26 23:37:46 2005  Minero Aoki  <aamine@loveruby.net>
 
 Sun Jan  2 11:48:19 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/racc/grammer.rb (once_writer): bug! needs argument.
+	* lib/racc/grammar.rb (once_writer): bug! needs argument.
 
 Mon Feb 16 16:14:16 2004  Minero Aoki  <aamine@loveruby.net>
 

data/README.ja.rdoc

@@ -1,23 +1,15 @@
 = Racc
 
-* http://i.loveruby.net/en/projects/racc/
+* https://github.com/ruby/racc
 
 == DESCRIPTION:
 
   Racc は LALR(1) パーサジェネレータです。
   yacc の Ruby 版に相当します。
 
-  NOTE:
-  Ruby 1.8.0 からは Racc のランタイムが標準添付されているので、
-  Racc で生成したパーサを安心して配布できます。また Ruby 1.6 系に
-  対応させたい場合は racc -E で生成してください。
-
-
 == 必要環境
 
-  *  Ruby 1.8 以降
- (*) C コンパイラと make
-
+  *  Ruby 2.5 以降
 
 == インストール
 
@@ -25,34 +17,6 @@
 
     $ gem install racc
 
-  setup.rb インストル：
-
-  パッケージのトップディレクトリで次のように入力してください。
-  ($ は通常ユーザ、# はルートのプロンプトです)
-
-      $ ruby setup.rb config
-      $ ruby setup.rb setup
-     ($ su)
-      # ruby setup.rb install
-
-  これで通常のパスに Racc がインストールされます。自分の好き
-  なディレクトリにインストールしたいときは、setup.rb config に
-  各種オプションをつけて実行してください。オプションのリストは
-
-      $ ruby setup.rb --help
-
-  で見られます。
-
-
-  コンパイラがない場合
-  --------------------
-
-  config を以下のようにすれば、拡張モジュールなしで
-  インストールできます。
-
-      $ ruby setup.rb config --without-ext
-
-
 == テスト
 
   sample/ 以下にいくつか Racc の文法ファイルのサンプルが用意

data/README.rdoc

@@ -17,32 +17,6 @@
 
     $ gem install racc
 
-  setup.rb install:
-
-  Type this in the top directory of the extracted archive:
-
-    $ ruby setup.rb config
-    $ ruby setup.rb setup
-   ($ su)
-    # ruby setup.rb install
-
-  You can install Racc into your favorite directory by giving
-  options to setup.rb. e.g.
-
-    $ ruby setup.rb config --prefix=/usr
-
-  For details, try "ruby setup.rb --help".
-
-
-  If you don't have C Compiler
-  ----------------------------
-
-  You can install Racc without C compilers. Type following
-  command in config phase.
-
-    $ ruby setup.rb config --without-ext
-
-
 == Testing Racc
 
   Racc comes with simple calculator. To compile this, on shell:
@@ -57,6 +31,13 @@
   For details of Racc, see HTML documents placed under 'doc/en/'
   and sample grammar files under 'sample/'.
 
+== Release flow
+
+* Update VERSION number of these files
+  * <code>RACC_VERSION</code> in "ext/racc/com/headius/racc/Cparse.java"
+  * <code>VERSION</code> in "lib/racc/info.rb"
+* Release as a gem by <code>rake release</code> with CRuby and JRuby because Racc gem provides 2 packages
+* Create new release on {GitHub}[https://github.com/ruby/racc/releases]
 
 == License
 

data/TODO

@@ -1,5 +1,5 @@
 * check 'error' token handling.
 * interactive transition table monitor.
 * support backtracking.
-* output Ruby extention library?
+* output Ruby extension library?
 * LL(k)? (But it should not be called Racc)

data/bin/racc

@@ -19,6 +19,7 @@ def main
   make_executable = false
   rubypath = nil
   embed_runtime = false
+  frozen_strings = false
   debug_flags = Racc::DebugFlags.new
   line_convert = true
   line_convert_all = false
@@ -29,7 +30,7 @@ def main
   profiler = RaccProfiler.new(false)
 
   parser = OptionParser.new
-  parser.banner = "Usage: #{File.basename($0)} [options] <input>"
+  parser.banner = "Usage: #{File.basename($0)} [options] [input]"
   parser.on('-o', '--output-file=PATH',
             'output file name [<input>.tab.rb]') {|name|
     output = name
@@ -57,6 +58,9 @@ def main
   parser.on('-E', '--embedded', "Embeds Racc runtime in output.") {
     embed_runtime = true
   }
+  parser.on('-F', '--frozen', "Add frozen_string_literals: true.") {
+    frozen_strings = true
+  }
   parser.on('--line-convert-all', 'Converts line numbers of user codes.') {
     line_convert_all = true
   }
@@ -88,54 +92,52 @@ def main
   #}
   parser.on('--version', 'Prints version and quit.') {
     puts "racc version #{Racc::Version}"
-    exit 0
+    exit
   }
   parser.on('--runtime-version', 'Prints runtime version and quit.') {
-    printf "racc runtime version %s; %s\n",
+    printf "racc runtime version %s; %s core version %s\n",
            Racc::Parser::Racc_Runtime_Version,
+           Racc::Parser.racc_runtime_type,
            if Racc::Parser.racc_runtime_type == 'ruby'
-             sprintf('ruby core version %s',
-                     Racc::Parser::Racc_Runtime_Core_Version_R)
+             Racc::Parser::Racc_Runtime_Core_Version_R
            else
-             sprintf('c core version %s',
-                     Racc::Parser::Racc_Runtime_Core_Version_C)
+             Racc::Parser::Racc_Runtime_Core_Version_C
            end
-    exit 0
+    exit
   }
   parser.on('--copyright', 'Prints copyright and quit.') {
     puts Racc::Copyright
-    exit 0
+    exit
   }
   parser.on('--help', 'Prints this message and quit.') {
     puts parser.help
-    exit 1
+    exit
   }
   begin
     parser.parse!
   rescue OptionParser::ParseError => err
-    $stderr.puts err.message
-    $stderr.puts parser.help
-    exit 1
-  end
-  if ARGV.empty?
-    $stderr.puts 'no input'
-    exit 1
+    abort [err.message, parser.help].join("\n")
   end
   if ARGV.size > 1
-    $stderr.puts 'too many input'
-    exit 1
+    abort 'too many input'
+  end
+
+  input = ARGV[0] || "stdin"
+
+  if input == "stdin" && !output then
+    abort 'You must specify a path to read or use -o <path> for output.'
   end
-  input = ARGV[0]
 
   begin
     $stderr.puts 'Parsing grammar file...' if verbose
     result = profiler.section('parse') {
       parser = Racc::GrammarFileParser.new(debug_flags)
-      parser.parse(File.read(input), File.basename(input))
+      content = input == "stdin" ? ARGF.read : File.read(input)
+      parser.parse(content, File.basename(input))
     }
     if check_only
       $stderr.puts 'syntax ok'
-      exit 0
+      exit
     end
 
     $stderr.puts 'Generating LALR states...' if verbose
@@ -150,6 +152,7 @@ def main
 
     $stderr.puts 'Creating parser file...' if verbose
     params = result.params.dup
+    params.filename = File.basename(input)
     # Overwrites parameters given by a grammar file with command line options.
     params.superclass = superclass if superclass
     params.omit_action_call = true if omit_action_call
@@ -162,6 +165,7 @@ def main
     params.convert_line = line_convert
     params.convert_line_all = line_convert_all
     params.embed_runtime = embed_runtime
+    params.frozen_strings = frozen_strings
     profiler.section('generation') {
       generator = Racc::ParserFileGenerator.new(states, params)
       generator.generate_parser_file(output || make_filename(input, '.tab.rb'))
@@ -189,11 +193,13 @@ def main
     end
 
     profiler.report
+    if states.should_error_on_expect_mismatch?
+      raise Racc::CompileError, "#{states.grammar.n_expected_srconflicts} shift/reduce conflicts are expected but #{states.n_srconflicts} shift/reduce conflicts exist"
+    end
   rescue Racc::Error, Errno::ENOENT, Errno::EPERM => err
     raise if $DEBUG or debug_flags.any?
     lineno = err.message.slice(/\A\d+:/).to_s
-    $stderr.puts "#{File.basename $0}: #{input}:#{lineno} #{err.message.strip}"
-    exit 1
+    abort "#{File.basename $0}: #{input}:#{lineno} #{err.message.strip}"
   end
 end
 
@@ -270,19 +276,13 @@ class RaccProfiler
   def initialize(really)
     @really = really
     @log = []
-    unless ::Process.respond_to?(:times)
-      # Ruby 1.6
-      @class = ::Time
-    else
-      @class = ::Process
-    end
   end
 
   def section(name)
     if @really
-      t1 = @class.times.utime
+      t1 = ::Process.times.utime
       result = yield
-      t2 = @class.times.utime
+      t2 = ::Process.times.utime
       @log.push [name, t2 - t1]
       result
     else

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 はその値です。