racc 1.4.14 → 1.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc823e3d2f74302a78716da88054a9c139fef28c
-  data.tar.gz: 846089f41620044090f7f1f8c0ffc8c8d2b048a4
+SHA256:
+  metadata.gz: '087cab6833c9ff39a56748e88d6774c2d4d2e89ed17bf25e5445b5d6fa445246'
+  data.tar.gz: 124e081f970a69af82ad769e9e1bba21d77a445b57d4842c29f80cea23d4a2fb
 SHA512:
-  metadata.gz: 9c4d722765b8ba6d9dccfb917d611a0f08787a39376ec89711269c578355a1fee56fe7bc94539f679279311be73ac1048f8b8287d15baa224ebb9aa86ef989a5
-  data.tar.gz: e48b9d8d038fe05a2f8073613fc2d674eef9ea2b4ba8060d6a6f5dc059f38cd5260604f42a6505d2aa509822bb1e177c203625b307d58f74725400ecaeca883e
+  metadata.gz: 4872a9290181db312d35e21c3cd23996f4c1e5766b5dc956983c3c60d374a333d6a36923852d57e5274e04036f5cd3ac85e2c7e36b2f4490ee732b38feb93aa8
+  data.tar.gz: e013f560178621e9a3b2e90ce74bcdcbb0c023b1c09b7df6dfcb64fb6ed8a8e0dc0d7e5b674b8508506e2980b09d8e330e0e7737c662a6d403572783d4bcfbb4

data/Manifest.txt

@@ -56,36 +56,86 @@ sample/yyerr.y
 setup.rb
 tasks/doc.rb
 tasks/email.rb
+test/assets/bibtex.y
+test/assets/cadenza.y
+test/assets/cast.y
 test/assets/chk.y
 test/assets/conf.y
+test/assets/csspool.y
 test/assets/digraph.y
 test/assets/echk.y
+test/assets/edtf.y
 test/assets/err.y
 test/assets/error_recovery.y
 test/assets/expect.y
 test/assets/firstline.y
+test/assets/huia.y
 test/assets/ichk.y
 test/assets/intp.y
+test/assets/journey.y
+test/assets/liquor.y
+test/assets/machete.y
+test/assets/macruby.y
+test/assets/mediacloth.y
 test/assets/mailp.y
+test/assets/mof.y
+test/assets/namae.y
+test/assets/nasl.y
 test/assets/newsyn.y
 test/assets/noend.y
+test/assets/nokogiri-css.y
 test/assets/nonass.y
 test/assets/normal.y
 test/assets/norule.y
 test/assets/nullbug1.y
 test/assets/nullbug2.y
+test/assets/opal.y
 test/assets/opt.y
 test/assets/percent.y
+test/assets/php_serialization.y
+test/assets/rdblockparser.y
+test/assets/rdinlineparser.y
 test/assets/recv.y
+test/assets/riml.y
 test/assets/rrconf.y
+test/assets/ruby18.y
+test/assets/ruby19.y
+test/assets/ruby20.y
+test/assets/ruby21.y
+test/assets/ruby22.y
 test/assets/scan.y
 test/assets/syntax.y
+test/assets/tp_plus.y
+test/assets/twowaysql.y
 test/assets/unterm.y
 test/assets/useless.y
 test/assets/yyerr.y
 test/bench.y
 test/helper.rb
 test/infini.y
+test/regress/bibtex
+test/regress/cadenza
+test/regress/cast
+test/regress/csspool
+test/regress/edtf
+test/regress/journey
+test/regress/huia
+test/regress/liquor
+test/regress/machete
+test/regress/mediacloth
+test/regress/mof
+test/regress/namae
+test/regress/nasl
+test/regress/nokogiri-css
+test/regress/opal
+test/regress/php_serialization
+test/regress/rdblockparser
+test/regress/rdinlineparser
+test/regress/riml
+test/regress/ruby18
+test/regress/ruby22
+test/regress/tp_plus
+test/regress/twowaysql
 test/scandata/brace
 test/scandata/gvar
 test/scandata/normal

data/ext/racc/com/headius/racc/Cparse.java

@@ -1,3 +1,17 @@
+/*
+    Cparse.java -- Racc Runtime Core for JRuby
+    
+    Copyright (c) 2016 Charles Oliver Nutter <headius@headius.com>
+    
+    Ported from and distributed under the same licence as cparse.c
+    
+    cparse.c -- Racc Runtime Core
+  
+    Copyright (c) 1999-2006 Minero Aoki
+  
+    This library is free software.
+    You can distribute/modify this program under the same terms of ruby.
+*/
 package com.headius.racc;
 
 import org.jruby.Ruby;
@@ -7,6 +21,7 @@ import org.jruby.RubyClass;
 import org.jruby.RubyContinuation;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyHash;
+import org.jruby.RubyKernel;
 import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
@@ -24,13 +39,14 @@ import org.jruby.runtime.CallSite;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.MethodIndex;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.Library;
 
 public class Cparse implements Library {
-    public static final String RACC_VERSION = "1.4.14"; // TODO: parse from Cparse.c
+    public static final String RACC_VERSION = "1.4.15"; // TODO: parse from Cparse.c
 
     public enum TokenType {
         DEFAULT(-1),
@@ -233,10 +249,6 @@ public class Cparse implements Library {
             shift(context, act, tok, val);
         }
 
-        private int REDUCE(ThreadContext context, int act) {
-            return reduce(context, act);
-        }
-
         public void parse_main(ThreadContext context, IRubyObject tok, IRubyObject val, boolean resume) {
             Ruby runtime = context.runtime;
 
@@ -267,7 +279,7 @@ public class Cparse implements Library {
                         i = assert_integer(tmp);
 
                         D_printf("read_next=%d\n", read_next);
-                        if (read_next && (this.t != vFINAL_TOKEN)) {
+                        if (read_next && (!this.t.equals(vFINAL_TOKEN))) {
                             if (this.lex_is_iterator) {
                                 D_puts("resuming...");
                                 if (this.fin != 0) throw runtime.newArgumentError("token given after EOF");
@@ -354,7 +366,21 @@ public class Cparse implements Library {
                         }
                         else if (act < 0 && act > -(this.reduce_n)) {
                             D_puts("reduce");
-                            REDUCE(context, act);
+                            { // macro REDUCE
+                                switch (reduce(context, act)) {
+                                    case 0: /* normal */
+                                        break;
+                                    case 1: /* yyerror */
+                                        branch = USER_YYERROR;
+                                        continue BRANCH;
+                                    case 2: /* yyaccept */
+                                        D_puts("u accept");
+                                        branch = ACCEPT;
+                                        continue BRANCH;
+                                    default:
+                                        break;
+                                }
+                            }
                         }
                         else if (act == -(this.reduce_n)) {
                             branch = ERROR; continue BRANCH;
@@ -367,6 +393,7 @@ public class Cparse implements Library {
                             throw runtime.newRaiseException(RaccBug, "[Cparse Bug] unknown act value " + act);
                         }
 
+                        // fall through
                     case ERROR_RECOVERED:
 
                         if (this.debug) {
@@ -389,9 +416,10 @@ public class Cparse implements Library {
                             call_onerror.call(context, this.parser, this.parser, this.t, val, this.vstack);
                         }
 
+                        // fall through
                     case USER_YYERROR:
                         if (this.errstatus == 3) {
-                            if (this.t == vFINAL_TOKEN) {
+                            if (this.t.equals(vFINAL_TOKEN)) {
                                 this.retval = runtime.getFalse();
                                 this.fin = CP_FIN_EOT;
                                 return;
@@ -464,7 +492,21 @@ public class Cparse implements Library {
                         }
                         else if (act < 0 && act > -(this.reduce_n)) {
                             D_puts("e reduce");
-                            REDUCE(context, act);
+                            { // macro REDUCE
+                                switch (reduce(context, act)) {
+                                    case 0: /* normal */
+                                        break;
+                                    case 1: /* yyerror */
+                                        branch = USER_YYERROR;
+                                        continue BRANCH;
+                                    case 2: /* yyaccept */
+                                        D_puts("u accept");
+                                        branch = ACCEPT;
+                                        continue BRANCH;
+                                    default:
+                                        break;
+                                }
+                            }
                         }
                         else if (act == this.shift_n) {
                             D_puts("e accept");
@@ -489,17 +531,18 @@ public class Cparse implements Library {
         }
 
         private int reduce(ThreadContext context, int act) {
-            IRubyObject code;
             ruleno = -act * 3;
             IRubyObject tag = context.runtime.newSymbol("racc_jump");
-            RubyContinuation rbContinuation = new RubyContinuation(context.runtime, context.runtime.newSymbol("racc_jump"));
-            try {
-                context.pushCatch(rbContinuation.getContinuation());
-                code = reduce0(context);
-                errstatus = assert_integer(parser.getInstanceVariable(ID_ERRSTATUS));
-            } finally {
-                context.popCatch();
-            }
+            IRubyObject code = RubyKernel.rbCatch19(context, this,
+                    tag,
+                    CallBlock19.newCallClosure(this, getMetaClass(), Signature.NO_ARGUMENTS,
+                            new BlockCallback() {
+                                @Override
+                                public IRubyObject call(ThreadContext context, IRubyObject[] args, Block block) {
+                                    return reduce0(context);
+                                }
+                            }, context));
+            errstatus = assert_integer(parser.getInstanceVariable(ID_ERRSTATUS));
             return assert_integer(code);
         }
 
@@ -527,13 +570,13 @@ public class Cparse implements Library {
                         /* call action */
                         if (len == 0) {
                             tmp = context.nil;
-                            if (mid != sym_noreduce)
+                            if (!mid.equals(sym_noreduce))
                                 tmp_v = runtime.newArray();
                             if (this.debug)
                                 tmp_t = runtime.newArray();
                         }
                         else {
-                            if (mid != sym_noreduce) {
+                            if (!mid.equals(sym_noreduce)) {
                                 tmp_v = GET_TAIL(context, this.vstack, len);
                                 tmp = ((RubyArray)tmp_v).entry(0);
                             }
@@ -547,7 +590,7 @@ public class Cparse implements Library {
                             }
                             CUT_TAIL(context, this.state, len);
                         }
-                        if (mid != sym_noreduce) {
+                        if (!mid.equals(sym_noreduce)) {
                             if (this.use_result_var) {
                                 tmp = Helpers.invoke(context, this.parser, mid.toString(), tmp_v, this.vstack, tmp);
                             }
@@ -590,7 +633,7 @@ public class Cparse implements Library {
                             D_puts("(goto) check[i] == nil");
                             branch = NOTFOUND; continue BRANCH;
                         }
-                        if (tmp != runtime.newFixnum(k1)) {
+                        if (!tmp.equals(runtime.newFixnum(k1))) {
                             D_puts("(goto) check[i] != table[i]");
                             branch = NOTFOUND; continue BRANCH;
                         }
@@ -759,7 +802,7 @@ public class Cparse implements Library {
                     }
                 }, context));
             } catch (LexerUnroll maybeOurs) {
-                if (maybeOurs == lexerUnroll) {
+                if (maybeOurs.equals(lexerUnroll)) {
                     return;
                 }
             }

data/ext/racc/cparse.c

@@ -17,7 +17,7 @@
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.14"
+#define RACC_VERSION "1.4.15"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1

data/ext/racc/depend

@@ -1 +1 @@
-cparse.o: cparse.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+cparse.o: cparse.c $(hdrdir)/ruby/ruby.h $(topdir)/config.h $(hdrdir)/ruby/defines.h

data/lib/racc/info.rb

@@ -1,5 +1,5 @@
 #
-# $Id: 22e498362c014749b453953e8d986243c0b8660c $
+# $Id: cb493ec682225ae384145f255590797788f7ef12 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -10,7 +10,7 @@
 #
 
 module Racc
-  VERSION   = '1.4.14'
+  VERSION   = '1.4.15'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/test/assets/bibtex.y

@@ -0,0 +1,141 @@
+#--
+# BibTeX-Ruby
+# Copyright (C) 2010-2011  Sylvester Keil <http://sylvester.keil.or.at>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+#
+# A BibTeX grammar for the parser generator +racc+
+#
+
+# -*- racc -*-
+
+class BibTeX::Parser
+
+token AT COMMA COMMENT CONTENT ERROR EQ LBRACE META_CONTENT KEY
+      NAME NUMBER PREAMBLE RBRACE SHARP STRING STRING_LITERAL
+
+expect 0
+
+rule
+
+  bibliography : /* empty */                       { result = BibTeX::Bibliography.new(@options) }
+               | objects                           { result = val[0] }
+
+  objects : object                                 { result = BibTeX::Bibliography.new(@options) << val[0] }
+          | objects object                         { result << val[1] }
+
+  object : AT at_object                            { result = val[1] }
+         | META_CONTENT                            { result = BibTeX::MetaContent.new(val[0]) }
+         | ERROR                                   { result = BibTeX::Error.new(val[0]) }
+
+  at_object : comment                              { result = val[0] }
+            | string                               { result = val[0] }
+            | preamble                             { result = val[0] }
+            | entry                                { result = val[0] }
+
+  comment : COMMENT LBRACE content RBRACE          { result = BibTeX::Comment.new(val[2]) }
+
+  content : /* empty */                            { result = '' }
+          | CONTENT                                { result = val[0] }
+
+  preamble : PREAMBLE LBRACE string_value RBRACE   { result = BibTeX::Preamble.new(val[2]) }
+
+  string : STRING LBRACE string_assignment RBRACE  { result = BibTeX::String.new(val[2][0],val[2][1]); }
+
+  string_assignment : NAME EQ string_value         { result = [val[0].downcase.to_sym, val[2]] }
+
+  string_value : string_literal                    { result = [val[0]] }
+               | string_value SHARP string_literal { result << val[2] }
+
+  string_literal : NAME                            { result = val[0].downcase.to_sym }
+                 | LBRACE content RBRACE           { result = val[1] }
+                 | STRING_LITERAL                  { result = val[0] }
+
+  entry : entry_head assignments RBRACE            { result = val[0] << val[1] }
+        | entry_head assignments COMMA RBRACE      { result = val[0] << val[1] }
+        | entry_head RBRACE                        { result = val[0] }
+
+  entry_head : NAME LBRACE opt_key                 { result = BibTeX::Entry.new(:bibtex_type => val[0].downcase.to_sym, :bibtex_key => val[2]) }
+
+  opt_key :                                        { missing_key }
+          | KEY
+
+  assignments : assignment                         { result = val[0] }
+              | assignments COMMA assignment       { result.merge!(val[2]) }
+
+  assignment : NAME EQ value                       { result = { val[0].downcase.to_sym => val[2] } }
+
+  value : string_value                             { result = val[0] }
+        | NUMBER                                   { result = val[0] }
+
+end
+
+---- header
+require 'bibtex/lexer'
+
+---- inner
+
+  attr_reader :lexer, :options
+
+  @defaults = {
+    :include => [:errors],
+    :allow_missing_keys => false,
+    :debug => false
+  }.freeze
+
+  class << self
+    attr_reader :defaults
+  end
+
+  def initialize(options = {})
+    @options = Parser.defaults.merge(options)
+    @lexer = Lexer.new(@options)
+  end
+
+  def parse(input)
+    @yydebug = debug?
+
+    lexer.analyse(input)
+    do_parse
+    #yyparse(@lexer,:each)
+  end
+
+  def next_token
+    lexer.next_token
+  end
+
+  def debug?
+    options[:debug] || ENV['DEBUG']
+  end
+
+  def allow_missing_keys?
+    options[:allow_missing_keys]
+  end
+
+  def missing_key
+    unless allow_missing_keys?
+      raise ParseError, "Failed to parse BibTeX entry: cite-key missing"
+    end
+  end
+
+  def on_error(tid, val, vstack)
+    message =
+      "Failed to parse BibTeX on value #{val.inspect} (#{token_to_str(tid) || '?'}) #{ vstack.inspect}"
+
+    BibTeX.log.error message
+    raise ParseError, message
+  end
+
+# -*- racc -*-