[yecht] 01/13: Fix a slight stupid corner case

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository yecht.

commit 9ce01e01305bcc1da5acb16159b60d7d0fb0385e
Author: Ola Bini <ola.bini at gmail.com>
Date:   Mon Jul 27 17:44:11 2009 +0200

    Fix a slight stupid corner case
---
 ext/ruby/src/java/org/yecht/ruby/YParser.java | 12 ++++++++++--
 src/main/org/yecht/BytecodeScanner.java       |  2 +-
 src/main/org/yecht/ImplicitScanner.java       |  2 +-
 src/main/org/yecht/TokenScanner.java          |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ext/ruby/src/java/org/yecht/ruby/YParser.java b/ext/ruby/src/java/org/yecht/ruby/YParser.java
index f21f473..85d4720 100644
--- a/ext/ruby/src/java/org/yecht/ruby/YParser.java
+++ b/ext/ruby/src/java/org/yecht/ruby/YParser.java
@@ -149,8 +149,12 @@ public class YParser {
             bonus.proc = proc;
         }
 
-        IRubyObject id = (IRubyObject)parser.parse();
-        IRubyObject result = id;
+        IRubyObject result = (IRubyObject)parser.parse();
+
+        if(result == null) {
+            result = runtime.getFalse();
+        }
+
         return result;
     }
 
@@ -179,6 +183,10 @@ public class YParser {
                 return runtime.getNil();
             }
 
+            if(v == null) {
+                v = runtime.getFalse();
+            }
+            
             proc.yield(ctx, v);
         }
     }
diff --git a/src/main/org/yecht/BytecodeScanner.java b/src/main/org/yecht/BytecodeScanner.java
index 9e564a4..6eb1027 100644
--- 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 Sun Jul 26 12:04:22 2009 */
+/* Generated by re2j 0.13.6.dev on Mon Jul 27 17:41:42 2009 */
 package org.yecht;
 
 import java.io.IOException;
diff --git a/src/main/org/yecht/ImplicitScanner.java b/src/main/org/yecht/ImplicitScanner.java
index 5046281..0c8b9c5 100644
--- 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 Sun Jul 26 12:04:22 2009 */
+/* Generated by re2j 0.13.6.dev on Mon Jul 27 17:41:42 2009 */
 package org.yecht;
 
 // Equivalent to implicit.re
diff --git a/src/main/org/yecht/TokenScanner.java b/src/main/org/yecht/TokenScanner.java
index 263a098..7fed874 100644
--- 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 Sun Jul 26 12:04:22 2009 */
+/* Generated by re2j 0.13.6.dev on Mon Jul 27 17:41:42 2009 */
 package org.yecht;
 
 import java.io.IOException;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/yecht.git