Fix stack size, history edit bug

ruboto · Mar 7, 2011 · 387d9a9 · 387d9a9
1 parent 6928aa3
commit 387d9a9
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 6 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -62,6 +62,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.READ_SMS"/>
     <uses-permission android:name="android.permission.SEND_SMS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

diff --git a/src/org/ruboto/Script.java b/src/org/ruboto/Script.java
@@ -17,6 +17,7 @@
 import java.util.List;
 
 import org.jruby.Ruby;
+import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.JavaUtil;
@@ -29,12 +30,17 @@
 import android.os.Environment;
 import android.util.Log;
 import android.content.res.AssetManager;
+import android.os.Handler;
+
+import android.util.Log;
+
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
 
 public class Script {
     public static final String UNTITLED_RB = "untitled.rb";
+    public static final boolean MORE_STACK = true;
 
     private static String scriptsDir = null;
     private static File scriptsDirFile = null;
@@ -54,6 +60,7 @@ public class Script {
     private Integer state = null;
 
     public static final String TAG = "RUBOTO"; //for logging
+    private final static Handler handler = new Handler();
 
     /*************************************************************************************************
      *
@@ -97,14 +104,42 @@ public static synchronized Ruby setUpJRuby(PrintStream out) {
         return ruby;
     }
 
-    public static String execute(String code) {
+    public static String execute(final String code) {
         if (!initialized) return null;
-        try {
-            return (String)ruby.evalScriptlet(code, scope).inspect().toJava(String.class);
-        } catch (RaiseException re) {
+        boolean moreStack = getGlobalVariable("$stack").isTrue();
+        Log.d("Script", "moreStack=" + moreStack);
+        if (moreStack) {
+          final String[] ret = new String[1];
+
+          try {
+              Thread t = new Thread(null, null, "executor", 16*1024) {
+                @Override public void run() {
+                  try {
+                    ret[0] = ruby.evalScriptlet(code, scope).inspect().toJava(String.class).toString();
+                  } catch (final RaiseException e) {
+                      handler.post(new Runnable() {
+                        public void run() {
+                           e.printStackTrace(ruby.getErrorStream());
+                        }
+                      });
+                  }
+                }
+              };
+              t.start();
+              t.join();
+
+              return ret[0];
+          } catch (InterruptedException e) {
+              return null;
+          }
+        } else {
+         try {
+            return ruby.evalScriptlet(code, scope).inspect().toJava(String.class).toString();
+          } catch (RaiseException re) {
             re.printStackTrace(ruby.getErrorStream());
             return null;
-        }
+          }
+       }
     }
 
     public static void defineGlobalConstant(String name, Object object) {
@@ -114,6 +149,11 @@ public static void defineGlobalConstant(String name, Object object) {
     public static void defineGlobalVariable(String name, Object object) {
         ruby.getGlobalVariables().set(name, JavaUtil.convertJavaToRuby(ruby, object));
     }
+
+    public static IRubyObject getGlobalVariable(String name) {
+        return ruby.getGlobalVariables().get(name);
+    }
+
 
     public static Ruby getRuby() {
     	return ruby;

diff --git a/src/org/ruboto/irb/HistoryEditText.java b/src/org/ruboto/irb/HistoryEditText.java
@@ -90,7 +90,7 @@ public boolean onEditorAction(TextView arg0, int actionId, KeyEvent event) {
 			for(; i < history.size(); i++) {
 				if (history.get(i).equals(line)) {
 					history.remove(i);
-					adapter.remove(adapter.getItem(i));
+					//  adapter.remove(adapter.getItem(i));
 					break;
 				}
 			}