Working. about to add GC.

Author: hackjackhack

JawaScriptExecutive-iOS/JawaArray.h

@@ -19,7 +19,6 @@ extern NSMutableDictionary* arrayPrototype;
 }
 @property NSMutableArray* elements;
 
-+(void) initialize;
 -(id) initIn:(JawaExecutor *)ex;
 -(NSString*) description;
 -(NSMutableString*) toJSON:(NSMutableString *)ret;

JawaScriptExecutive-iOS/JawaArray.m

@@ -14,12 +14,6 @@
 
 @implementation JawaArray
 
-+(void)initialize {
-    if (self == [JawaArray class]) {
-        arrayPrototype = [[NSMutableDictionary alloc]init];
-    }
-}
-
 -(id)initIn:(JawaExecutor *)ex {
     self = [super init];
     if (self) {
@@ -31,11 +25,39 @@ -(id)initIn:(JawaExecutor *)ex {
 }
 
 -(NSString*)description {
-    return @"";
+    BOOL first = true;
+    NSMutableString* ret = [NSMutableString stringWithString:@"["];
+    for (JawaObjectRef* obj in self.elements) {
+        if (!first)
+            [ret appendString:@","];
+        first = false;
+        [ret appendString:[obj description]];
+    }
+    [ret appendString:@"]"];
+    return ret;
 }
 
 -(NSMutableString*) toJSON:(NSMutableString*)ret {
-    return [NSMutableString stringWithFormat: @""];
+    if (ret == nil)
+        ret = [NSMutableString stringWithString:@""];
+    BOOL first = true;
+    [ret appendString:@"["];
+    for (JawaObjectRef* obj in self.elements) {
+        if (!first)
+            [ret appendString:@","];
+        first = false;
+        if ([obj.object isMemberOfClass:[NSMutableString class]]) {
+            [ret appendString:@"\""];
+            NSString* r = [[obj description] stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+            [ret appendString:r];
+            [ret appendString:@"\""];
+        } else if ([obj.object isKindOfClass:[JawaObject class]]) {
+            [((JawaObject*)obj.object) toJSON:ret];
+        } else
+            [ret appendString:[obj description]];
+    }
+    [ret appendString:@"]"];
+    return ret;
 }
 
 -(void)append:(JawaObjectRef*)element {
@@ -51,10 +73,14 @@ -(JawaObjectRef*)at:(int)index {
 }
 
 -(JawaObjectRef*)invokeBuiltin:(NSString*)funcName {
-    int ID = [self getBuiltinID:funcName];
+    NSUInteger ID = [self getBuiltinID:funcName];
     switch(ID) {
+        // Array.length
+        case 0: {
+            return [JawaObjectRef RefWithNumber:self.elements.count in:self.executor];
+        }
         default:
-            break;
+            [NSException raise:@"JavaScript Runtime Exception" format:@"%@ not implemented yet", funcName];
     }
     return nil;
 }

JawaScriptExecutive-iOS/JawaExecutor.h

@@ -79,19 +79,33 @@ typedef NS_ENUM(NSInteger, ASTType) {
 };
 
 #define PR_statements @"0"
+#define PR_arguments @"2"
 #define PR_id @"3"
 
 #define PR_elements @"7"
 #define PR_literal @"8"
+#define PR_object @"10"
+#define PR_property @"11"
+#define PR_function @"12"
+#define PR_ops @"15"
+#define PR_subExpressions @"16"
+#define PR_onTrue @"18"
+#define PR_onFalse @"19"
 #define PR_params @"23"
 #define PR_body @"24"
+#define PR_test @"25"
 #define PR_varName @"26"
 #define PR_initialization @"27"
+#define PR_iterable @"28"
+#define PR_iterator @"29"
+#define PR_init @"30"
+#define PR_update @"31"
+#define PR_argument @"32"
 #define PR_declarations @"33"
 
 typedef NS_ENUM(NSInteger, PropType) {
     PR_valueType,
-    PR_arguments,
+    
 
     PR_key,
 
@@ -101,33 +115,30 @@ typedef NS_ENUM(NSInteger, PropType) {
 
     PR_constructor,
 
-    PR_object,
-    PR_property,
-    PR_function,
+    
+    
     PR_subExpression,
     PR_op,
 
-    PR_ops,
-    PR_subExpressions,
+    
     PR_condition,
-    PR_onTrue,
-    PR_onFalse,
+    
 
     PR_left,
     PR_right,
     PR_expressions,
 
 
 
-    PR_test,
 
 
-    PR_iterable,
-    PR_iterator,
 
-    PR_init,
-    PR_update,
-    PR_argument,
+    
+    
+    
+    
+    
+    
 
 };