More fixes

olabini · Jul 16, 2009 · 94609a6 · 94609a6
1 parent a36ba38
commit 94609a6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/ext/ruby/src/java/org/yecht/ruby/YechtYAML.java b/ext/ruby/src/java/org/yecht/ruby/YechtYAML.java
@@ -451,7 +451,7 @@ public static void setModel(IRubyObject p, IRubyObject input, IRubyObject model)
         parser.implicitTyping(true);
         parser.taguriExpansion(true);
 
-        if(input.isNil()) {
+        if(input == null || input.isNil()) {
             input = p.getInstanceVariables().getInstanceVariable("@input");
         }
 

diff --git a/src/main/org/yecht/BytecodeScanner.java b/src/main/org/yecht/BytecodeScanner.java
@@ -1,4 +1,4 @@
-/* Generated by re2j 0.13.6.dev on Thu Jul 16 18:09:12 2009 */
+/* Generated by re2j 0.13.6.dev on Thu Jul 16 18:23:59 2009 */
 package org.yecht;
 
 import java.io.IOException;

diff --git a/src/main/org/yecht/ImplicitScanner.java b/src/main/org/yecht/ImplicitScanner.java
@@ -1,4 +1,4 @@
-/* Generated by re2j 0.13.6.dev on Thu Jul 16 18:09:12 2009 */
+/* Generated by re2j 0.13.6.dev on Thu Jul 16 18:23:59 2009 */
 package org.yecht;
 
 // Equivalent to implicit.re
@@ -1645,6 +1645,10 @@ public static String typeIdToUri(String type_id) {
         try {
           data = type_id.getBytes("ISO8859-1");
         } catch(Exception e) {}
+        byte[] dx = new byte[data.length+1];
+        System.arraycopy(data, 0, dx, 0, data.length);
+        dx[data.length] = 0;
+        data = dx;
         int cursor = 0;
         int limit = data.length;
         int marker = -1;

diff --git a/src/main/org/yecht/ImplicitScanner.re b/src/main/org/yecht/ImplicitScanner.re
@@ -138,6 +138,10 @@ ANY                 {   return "str"; }
         try {
           data = type_id.getBytes("ISO8859-1");
         } catch(Exception e) {}
+        byte[] dx = new byte[data.length+1];
+        System.arraycopy(data, 0, dx, 0, data.length);
+        dx[data.length] = 0;
+        data = dx;
         int cursor = 0;
         int limit = data.length;
         int marker = -1;

diff --git a/src/main/org/yecht/TokenScanner.java b/src/main/org/yecht/TokenScanner.java
@@ -1,4 +1,4 @@
-/* Generated by re2j 0.13.6.dev on Thu Jul 16 18:09:12 2009 */
+/* Generated by re2j 0.13.6.dev on Thu Jul 16 18:23:58 2009 */
 package org.yecht;
 
 import java.io.IOException;

diff --git a/src/main/org/yecht/YAMLGrammarTokens.java b/src/main/org/yecht/YAMLGrammarTokens.java
@@ -1,4 +1,4 @@
-// Output created by jacc on Thu Jul 16 18:09:12 CEST 2009
+// Output created by jacc on Thu Jul 16 18:23:59 CEST 2009
 
 package org.yecht;
 

diff --git a/src/main/org/yecht/YechtParser.java b/src/main/org/yecht/YechtParser.java
@@ -1,4 +1,4 @@
-// Output created by jacc on Thu Jul 16 18:09:12 CEST 2009
+// Output created by jacc on Thu Jul 16 18:23:59 CEST 2009
 
 package org.yecht;