Fixed constants and fs, and finally got rid of Io.

eddyb-abandoned · Nov 1, 2011 · 96820f7 · 96820f7
1 parent 4d65559
commit 96820f7
Show file tree

Hide file tree

Showing 14 changed files with 978 additions and 320 deletions.
diff --git a/node.gyp b/node.gyp
@@ -22,9 +22,6 @@
       'src/modules/sys.js',
       'src/modules/url.js',
       'src/modules/util.js',
-
-      #FIXME
-      'src/modules/Io.gear',
     ],
     'gear_output': [
       'src/modules/assert.cc',
@@ -40,9 +37,6 @@
       'src/modules/sys.cc',
       'src/modules/url.cc',
       'src/modules/util.cc',
-
-      #FIXME
-      'src/modules/Io.cc',
     ],
   },
 

diff --git a/src/Context.cc b/src/Context.cc
@@ -22,7 +22,6 @@
 #include <gearbox.h>
 
 #include <cstdlib>
-#include <iostream>
 
 namespace Gearbox {
     Context *Context::m_pCurrentContext = 0;
@@ -32,26 +31,6 @@ namespace Gearbox {
         return undefined;
     }
 
-    static v8::Handle<v8::Value> _load(const v8::Arguments& args) {
-        if(args.Length() >= 1) {
-            Value file(args[0]);
-
-            TryCatch tryCatch;
-            String source = NativeModule::require("Io")["read"](file);
-
-            // Report exceptions caught while reading the file
-            if(tryCatch.hasCaught())
-                return undefined;
-
-            Context *pCurrentContext = Context::getCurrent();
-            if(!pCurrentContext)
-                THROW_ERROR("No Context is in use");
-
-            return pCurrentContext->runScript(source, file);
-        }
-        THROW_ERROR("Invalid call to load");
-    }
-
     static v8::Handle<v8::Value> _print(const v8::Arguments& args) {
         if(args.Length()) {
             for(int i = 0; i < args.Length(); i++)
@@ -118,7 +97,6 @@ namespace Gearbox {
         var _global = global();
 
         _global["exit"] = Function(_exit, "exit");
-        _global["load"] = Function(_load, "load");
         _global["print"] = Function(_print, "print");
         _global["require"] = NativeModule::getRequireFunc();
 

diff --git a/src/main.cc b/src/main.cc
@@ -23,8 +23,6 @@
 
 using namespace Gearbox;
 
-#include <iostream>
-
 int main(int argc, char *argv[]) {
     v8::HandleScope handleScope;
 
@@ -43,14 +41,11 @@ int main(int argc, char *argv[]) {
     for(int i = 1; i < argc; i++) {
         String arg = argv[i];
 
-        // Warn about unknown flags
-        if(arg.compare("--", 2))
-            std::cerr << "Warning: unknown flag " << *arg << "." << std::endl <<  "Try --help for options" << std::endl;
-        // Treat the first argument that is not an option as a file to execute
-        else {
+        // Ignore unknown flags
+        if(!arg.compare("-", 2)) {
 
             // Read the file
-            String source = NativeModule::require("Io")["read"](arg);
+            String source = NativeModule::require("fs")["readFileSync"](arg);
 
             // Report exceptions caught while reading the file
             if(tryCatch.hasCaught())

diff --git a/src/modules/Io.cc b/src/modules/Io.cc
diff --git a/src/modules/Io.gear b/src/modules/Io.gear