racc 1.4.12-java → 1.4.13-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64b7450f28cdca4e407bd597d64e6a8b635e5f3
-  data.tar.gz: 5faf2ea06a588cc579f9339cdf299b29357af6cc
+  metadata.gz: b4fc725ef77f34fbb5b4dccd7f231a842b8bfd7c
+  data.tar.gz: 685f8318b917162f0a07beac64ebd41960d78203
 SHA512:
-  metadata.gz: 8a416cc7f06502eeb0677ddd5bd6f5e75c29702df58d3a0009de8ab36b38e68492a4429158b063c5bd82ece0e753b2cfdfc54bb9b46de980aa1f9cc3578195d0
-  data.tar.gz: 8dc5911addde1f6d98ee6bc2bc20ab78711e5d2e60bd424e584fb079d7525ec6c5b988876b13391ea82db5dea1b40355f42234a32e5fb5c2e06f2426907bd12f
+  metadata.gz: 4fe9b8ec6a5d373eda60d79db37d8c3a43065ba5ffd34ddddf8207afd2055ab246067b706dac6e3969de49195f38307303142749a93a2efcd7bc612dc366c80f
+  data.tar.gz: 83894982df218989c2556874dfcff4e2dccbc226af7e31ad98c235f90ade5330991a40e165137c85276925e3a7c6e71c52e45421237e473baf6e0d12b33c01d8

data/Rakefile

@@ -11,7 +11,7 @@ def java?
   /java/ === RUBY_PLATFORM
 end
 def jruby?
-  'jruby' == RUBY_ENGINE
+  Object.const_defined?(:RUBY_ENGINE) and 'jruby' == RUBY_ENGINE
 end
 
 HOE = Hoe.spec 'racc' do

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

@@ -30,7 +30,7 @@ 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.12"; // TODO: parse from Cparse.c
+    public static final String RACC_VERSION = "1.4.13"; // TODO: parse from Cparse.c
 
     public enum TokenType {
         DEFAULT(-1),
@@ -70,8 +70,6 @@ public class Cparse implements Library {
     private CallSite call_d_read_token;
     private CallSite call_d_next_state;
     private CallSite call_d_e_pop;
-    private AttrWriterMethod set_errstatus;
-    private AttrReaderMethod get_errstatus;
 
     private static RubySymbol value_to_id(ThreadContext context, IRubyObject v) {
         if (!(v instanceof RubySymbol)) {
@@ -173,7 +171,7 @@ public class Cparse implements Library {
             this.t               = runtime.newFixnum(TokenType.FINAL.id + 1); // must not init to FINAL_TOKEN
             this.nerr            = 0;
             this.errstatus       = 0;
-            set_errstatus.call(context, parser, parser.getMetaClass(), ID_ERRSTATUS, RubyNumeric.int2fix(runtime, this.errstatus));
+            this.parser.setInstanceVariable(ID_ERRSTATUS, runtime.newFixnum(this.errstatus));
 
             this.retval          = context.nil;
             this.fin             = 0;
@@ -349,7 +347,7 @@ public class Cparse implements Library {
                             D_puts("shift");
                             if (this.errstatus > 0) {
                                 this.errstatus--;
-                                set_errstatus.call(context, this.parser, this.parser.getMetaClass(), ID_ERRSTATUS, runtime.newFixnum(this.errstatus));
+                                this.parser.setInstanceVariable(ID_ERRSTATUS, runtime.newFixnum(this.errstatus));
                             }
                             SHIFT(context, act, this.t, val);
                             read_next = true;
@@ -401,7 +399,7 @@ public class Cparse implements Library {
                             read_next = true;
                         }
                         this.errstatus = 3;
-                        set_errstatus.call(context, this.parser, this.parser.getMetaClass(), ID_ERRSTATUS, runtime.newFixnum(this.errstatus));
+                        this.parser.setInstanceVariable(ID_ERRSTATUS, runtime.newFixnum(this.errstatus));
 
                         /* check if we can shift/reduce error token */
                         D_printf("(err) k1=%ld\n", this.curstate);
@@ -498,7 +496,7 @@ public class Cparse implements Library {
             try {
                 context.pushCatch(rbContinuation.getContinuation());
                 code = reduce0(context);
-                errstatus = assert_integer(get_errstatus.call(context, parser, parser.getMetaClass(), ID_ERRSTATUS));
+                errstatus = assert_integer(parser.getInstanceVariable(ID_ERRSTATUS));
             } finally {
                 context.popCatch();
             }
@@ -734,8 +732,14 @@ public class Cparse implements Library {
             return v.retval;
         }
 
+        private class LexerUnroll extends RuntimeException {
+            public Throwable fillInStackTrace() {
+                return this;
+            }
+        }
+
         private void call_lexer(ThreadContext context, final CparseParams v) {
-            final int frame = context.getFrameJumpTarget();
+            final LexerUnroll lexerUnroll = new LexerUnroll();
             try {
                 v.call_lexmid.call(context, v.lexer, v.lexer, CallBlock19.newCallClosure(v, v.getMetaClass(), Arity.ONE_ARGUMENT, new BlockCallback() {
                     @Override
@@ -748,14 +752,14 @@ public class Cparse implements Library {
                         v.extract_user_token(context, args[0], tokVal);
                         v.parse_main(context, tokVal[0], tokVal[1], true);
                         if (v.fin != 0 && v.fin != CP_FIN_ACCEPT) {
-                            throw new JumpException.BreakJump(frame, context.nil);
+                            throw lexerUnroll;
                         }
 
                         return context.nil;
                     }
                 }, context));
-            } catch (JumpException.BreakJump bj) {
-                if (bj.getTarget() == frame) {
+            } catch (LexerUnroll maybeOurs) {
+                if (maybeOurs == lexerUnroll) {
                     return;
                 }
             }
@@ -795,10 +799,6 @@ public class Cparse implements Library {
         call_d_next_state = MethodIndex.getFunctionalCallSite(ID_D_NEXT_STATE);
         call_d_e_pop = MethodIndex.getFunctionalCallSite(ID_D_E_POP);
 
-        // hacky utility for caching instance var accessor
-        set_errstatus = new AttrWriterMethod(parser, Visibility.PUBLIC, CallConfiguration.FrameNoneScopeNone, ID_ERRSTATUS);
-        get_errstatus = new AttrReaderMethod(parser, Visibility.PUBLIC, CallConfiguration.FrameNoneScopeNone, ID_ERRSTATUS);
-
         vDEFAULT_TOKEN      = runtime.newFixnum(TokenType.DEFAULT.id);
         vERROR_TOKEN      = runtime.newFixnum(TokenType.ERROR.id);
         vFINAL_TOKEN      = runtime.newFixnum(TokenType.FINAL.id);

data/ext/racc/cparse.c

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

data/lib/racc/info.rb

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

data/lib/racc/parser-text.rb

@@ -1,7 +1,7 @@
 module Racc
   PARSER_TEXT = <<'__end_of_file__'
 #
-# $Id: a7af944d201a32a63d2536cdd589d8e9910848e0 $
+# $Id: f015c335c3b92ed58b32b8fb00163be48783f689 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -189,12 +189,12 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: a7af944d201a32a63d2536cdd589d8e9910848e0 $'
+    Racc_Runtime_Revision = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'
 
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: a7af944d201a32a63d2536cdd589d8e9910848e0 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'.split[1]
     begin
-      if RUBY_ENGINE == 'jruby'
+      if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
         require 'racc/cparse-jruby.jar'
         com.headius.racc.Cparse.new.load(JRuby.runtime, false)
       else

data/lib/racc/parser.rb

@@ -1,5 +1,5 @@
 #
-# $Id: a7af944d201a32a63d2536cdd589d8e9910848e0 $
+# $Id: f015c335c3b92ed58b32b8fb00163be48783f689 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -187,12 +187,12 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: a7af944d201a32a63d2536cdd589d8e9910848e0 $'
+    Racc_Runtime_Revision = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'
 
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: a7af944d201a32a63d2536cdd589d8e9910848e0 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'.split[1]
     begin
-      if RUBY_ENGINE == 'jruby'
+      if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
         require 'racc/cparse-jruby.jar'
         com.headius.racc.Cparse.new.load(JRuby.runtime, false)
       else

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: racc
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.13
 platform: java
 authors:
 - Aaron Patterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   prerelease: false
@@ -28,12 +28,12 @@ dependencies:
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   prerelease: false
@@ -42,12 +42,12 @@ dependencies:
   name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
   prerelease: false
@@ -56,14 +56,14 @@ dependencies:
   name: hoe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   prerelease: false
   type: :development
 description: |-
@@ -91,6 +91,7 @@ extra_rdoc_files:
 - rdoc/ja/grammar.ja.rdoc
 - rdoc/ja/parser.ja.rdoc
 files:
+- ".gemtest"
 - COPYING
 - ChangeLog
 - DEPENDS
@@ -103,14 +104,15 @@ files:
 - bin/racc2y
 - bin/y2racc
 - ext/racc/MANIFEST
+- ext/racc/com/headius/racc/Cparse.java
 - ext/racc/cparse.c
 - ext/racc/depend
 - ext/racc/extconf.rb
-- ext/racc/com/headius/racc/Cparse.java
 - fastcache/extconf.rb
 - fastcache/fastcache.c
 - lib/racc.rb
 - lib/racc/compat.rb
+- lib/racc/cparse-jruby.jar
 - lib/racc/debugflags.rb
 - lib/racc/exception.rb
 - lib/racc/grammar.rb
@@ -192,36 +194,30 @@ files:
 - test/testscanner.rb
 - web/racc.en.rhtml
 - web/racc.ja.rhtml
-- .gemtest
-- lib/racc/cparse-jruby.jar
 homepage: http://i.loveruby.net/en/projects/racc/
 licenses:
 - MIT
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Racc is a LALR(1) parser generator
-test_files:
-- test/test_chk_y.rb
-- test/test_grammar_file_parser.rb
-- test/test_racc_command.rb
-- test/test_scan_y.rb
+test_files: []