Command line fixes and more (read CHANGELOG)

evilsocket · Mar 16, 2010 · 1002702 · 1002702
1 parent 3f5961c
commit 1002702
Show file tree

Hide file tree

Showing 45 changed files with 24 additions and 68 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
@@ -16,7 +16,6 @@ hybris: builtins
 	g++ -c src/lexer.cpp $(CFLAGS)
 	g++ -c src/builtin.cpp $(CFLAGS)
 	g++ -c src/vmem.cpp $(CFLAGS)
-	g++ -c src/cmdline.cpp $(CFLAGS)
 	g++ -c src/node.cpp $(CFLAGS)
 	g++ -c src/object.cpp $(CFLAGS)
 	g++ -c src/tree.cpp $(CFLAGS)

diff --git a/README b/README
diff --git a/examples/Makefile b/examples/Makefile
diff --git a/examples/libtest.cc b/examples/libtest.cc
diff --git a/examples/passed.zip b/examples/passed.zip
diff --git a/examples/test.dat b/examples/test.dat
diff --git a/examples/test.xml b/examples/test.xml
diff --git a/hybris.cbp b/hybris.cbp
diff --git a/include/builtin.h b/include/builtin.h
diff --git a/include/common.h b/include/common.h
@@ -38,7 +38,7 @@ typedef struct {
 function_decl_t;
 
 typedef enum {
-    H_NONE,
+    H_NONE = 0,
     H_EXECUTE,
     H_COMPILE,
     H_RUN

diff --git a/include/config.h b/include/config.h
@@ -20,7 +20,7 @@
 #   define _HCONFIG_H_
 
 #define AUTHOR  "The Hybris Dev Team [http://www.hybris-lang.org/]"
-#define VERSION "0.7b"
+#define VERSION "0.7.1b"
 
 // system path for libraries (.so dynamic libs)
 #define LIBS_PATH "/usr/lib/hybris/libs/"

diff --git a/include/hybris.h b/include/hybris.h
diff --git a/include/map.h b/include/map.h
diff --git a/include/node.h b/include/node.h
diff --git a/include/object.h b/include/object.h
diff --git a/include/tree.h b/include/tree.h
diff --git a/include/vmem.h b/include/vmem.h
diff --git a/src/builtin.cpp b/src/builtin.cpp
diff --git a/src/builtins/array.cc b/src/builtins/array.cc
diff --git a/src/builtins/conio.cc b/src/builtins/conio.cc
diff --git a/src/builtins/dll.cc b/src/builtins/dll.cc
diff --git a/src/builtins/encoding.cc b/src/builtins/encoding.cc
diff --git a/src/builtins/fileio.cc b/src/builtins/fileio.cc
diff --git a/src/builtins/http.cc b/src/builtins/http.cc
diff --git a/src/builtins/map.cc b/src/builtins/map.cc
diff --git a/src/builtins/math.cc b/src/builtins/math.cc
diff --git a/src/builtins/matrix.cc b/src/builtins/matrix.cc
diff --git a/src/builtins/netio.cc b/src/builtins/netio.cc
diff --git a/src/builtins/pcre.cc b/src/builtins/pcre.cc
diff --git a/src/builtins/process.cc b/src/builtins/process.cc
diff --git a/src/builtins/pthreads.cc b/src/builtins/pthreads.cc
diff --git a/src/builtins/reflection.cc b/src/builtins/reflection.cc
diff --git a/src/builtins/string.cc b/src/builtins/string.cc
diff --git a/src/builtins/time.cc b/src/builtins/time.cc
diff --git a/src/builtins/type.cc b/src/builtins/type.cc
diff --git a/src/builtins/xml.cc b/src/builtins/xml.cc
diff --git a/src/common.cpp b/src/common.cpp
diff --git a/src/hybris.cpp b/src/hybris.cpp
diff --git a/src/lexer.l.cpp b/src/lexer.l.cpp
diff --git a/src/node.cpp b/src/node.cpp
diff --git a/src/object.cpp b/src/object.cpp
diff --git a/src/parser.y.cpp b/src/parser.y.cpp
@@ -19,7 +19,6 @@
 */
 
 #include "hybris.h"
-#include "cmdline.h"
 
 #define YY_(s) (char *)s
 
@@ -198,92 +197,50 @@ int h_banner(){
 
 int h_usage( char *argvz ){
     h_banner();
-    printf( /*"\nUsage: %s (action) (-o output) file (--trace)\n"*/
-           "\nUsage: %s (action) file (--trace)\n"
-           "Where action could be :\n"
-           "\t-e : Execute the script as an interpreter .\n\n"
-           /*"\t-c : Compile the script in x-byte-code and save it to 'output' .\n"
-           "\t-r : Load the x-byte-code from 'file' and run it .\n\n"*/
-           "\t--trace : Will enable stack trace report on errors .\n\n"
-           "Notes :\n"
-           "If no action is specified, it's assumed as '-e file' .\n\n"
-           /* "If -c is set and no output is specified, the file will be compiled into 'output.ch' .\n\n" */ , argvz );
+    printf( "\nUsage: %s file (--trace)\n"
+           "\t--trace : Will enable stack trace report on errors .\n\n", argvz );
     return 0;
 }
 
 int main( int argc, char *argv[] ){
     if( argc < 2 ){
-        return h_banner();
+        return h_usage( argv[0] );
     }
     else{
-        CmdLine cmdline( argc, argv );
 
-        if( cmdline.isset("-h") || cmdline.isset("--help") ){
-            return h_usage( argv[0] );
-        }
-
-        memset( &HCTX.HARGS, 0x00, sizeof(h_args_t) );
-        if( cmdline.isset( "-e" ) ){
-            cmdline.get( "-e", HCTX.HARGS.source );
-            HCTX.HARGS.action = H_EXECUTE;
-        }
-        else if( cmdline.isset( "-c" ) ){
-            cmdline.get( "-c", HCTX.HARGS.source );
-            HCTX.HARGS.action = H_COMPILE;
-            if( cmdline.isset( "-o" ) ){
-                cmdline.get( "-o", HCTX.HARGS.destination );
+        int i, f_offset = 0;
+        for( i = 0; i < argc; i++ ){
+            if( strcmp( argv[i], "--trace" ) == 0 ){
+                HCTX.HARGS.stacktrace = 1;
             }
             else{
-                strcpy( HCTX.HARGS.destination, "output.ch" );
+                f_offset = i;
             }
         }
-        else if( cmdline.isset( "-r" ) ){
-            cmdline.get( "-r", HCTX.HARGS.source );
-            HCTX.HARGS.action = H_RUN;
-        }
-        else{
-            cmdline.nonFlaggedArg( HCTX.HARGS.source );
-            HCTX.HARGS.action = H_EXECUTE;
-        }
 
-        HCTX.HARGS.stacktrace = cmdline.isset("--trace");
+        HCTX.HARGS.action = H_EXECUTE;
+        strncpy( HCTX.HARGS.source, argv[f_offset], sizeof(HCTX.HARGS.source) );
 
-        if( h_file_exists(HCTX.HARGS.source) == 0 ){
-            printf( "Error :'%s' no such file or directory .\n\n", HCTX.HARGS.source );
-            return h_usage( argv[0] );
+        if( f_offset > 0 ){
+            if( h_file_exists(HCTX.HARGS.source) == 0 ){
+                printf( "Error :'%s' no such file or directory .\n\n", HCTX.HARGS.source );
+                return h_usage( argv[0] );
+            }
         }
 
         h_env_init( &HCTX, argc, argv );
 
-		/* compile or execute */
-        if( HCTX.HARGS.action != H_RUN ){
-            extern FILE *yyin;
-            yyin = fopen( HCTX.HARGS.source, "r");
+        extern FILE *yyin;
+        yyin = f_offset > 0 ? fopen( HCTX.HARGS.source, "r") : stdin;
 
-			h_changepath( &HCTX );
-            while( !feof(yyin) ){
-                yyparse();
-            }
+        h_changepath( &HCTX );
+        while( !feof(yyin) ){
+            yyparse();
+        }
+        if( f_offset > 0 ){
             fclose(yyin);
         }
-		/* run pseudo-compiled byte code
-        else{
-            FILE *input = fopen( HARGS.source, "rb" );
-
-			h_changepath();
-            if( h_check_header(input) == 0 ){
-                fclose(input);
-                hybris_generic_error( "'%s' damaged or invalid file", HARGS.source );
-            }
 
-            while( !feof(input) ){
-                Node *tree = htree_load(input);
-                htree_execute(&HVM,tree);
-                Tree::release(tree);
-            }
-            fclose(input);
-        }
-        */
         h_env_release(&HCTX);
     }
 

diff --git a/src/tree.cpp b/src/tree.cpp
diff --git a/src/vmem.cpp b/src/vmem.cpp