Added an object pool to hold strong reference to all JawaObjectRef.

hackjackhack · hackjackhack · commit 4c8f74bd81bf · 2016-03-08T18:19:42.000+08:00
Use NSPointerArray and NSMapTable in JawaArray and JawaObject respectively to hold weak references.
No GC yet.
diff --git a/JawaScriptExecutive-iOS/JawaArray.h b/JawaScriptExecutive-iOS/JawaArray.h
@@ -17,7 +17,7 @@ extern NSMutableDictionary* arrayPrototype;
 {
     
 }
-@property NSMutableArray* elements;
+@property NSPointerArray* elements;
 
 -(id) initIn:(JawaExecutor *)ex;
 -(NSString*) description;
diff --git a/JawaScriptExecutive-iOS/JawaArray.m b/JawaScriptExecutive-iOS/JawaArray.m
@@ -18,7 +18,7 @@ -(id)initIn:(JawaExecutor *)ex {
     self = [super init];
     if (self) {
         _prototype = arrayPrototype;
-        _elements = [[NSMutableArray alloc]init];
+        _elements = [NSPointerArray weakObjectsPointerArray];
         _executor = ex;
     }
     return self;
@@ -61,15 +61,15 @@ -(NSMutableString*) toJSON:(NSMutableString*)ret {
 }
 
 -(void)append:(JawaObjectRef*)element {
-    // Need weak references stored in NSArray.
-    NSValue* weakRef = [NSValue valueWithNonretainedObject:element];
-    [self.elements addObject:weakRef];
+    // Need weak references (raw pointer) stored in the array.
+    [self.elements addPointer:(__bridge void * _Nullable)(element)];
+    //printf("count : %ld", CFGetRetainCount((__bridge CFTypeRef)element));
 }
 
 -(JawaObjectRef*)at:(int)index {
     if (index < 0 || index >= [self.elements count])
         return nil;
-    return [self.elements objectAtIndex:index];
+    return [self.elements pointerAtIndex:index];
 }
 
 -(JawaObjectRef*)invokeBuiltin:(NSString*)funcName {
diff --git a/JawaScriptExecutive-iOS/JawaExecutor.h b/JawaScriptExecutive-iOS/JawaExecutor.h
@@ -79,18 +79,28 @@ typedef NS_ENUM(NSInteger, ASTType) {
 };
 
 #define PR_statements @"0"
+#define PR_valueType @"1"
 #define PR_arguments @"2"
 #define PR_id @"3"
-
+#define PR_key @"4"
+#define PR_expr @"5"
+#define PR_properties @"6"
 #define PR_elements @"7"
 #define PR_literal @"8"
+#define PR_constructor @"9"
 #define PR_object @"10"
 #define PR_property @"11"
 #define PR_function @"12"
+#define PR_subExpression @"13"
+#define PR_op @"14"
 #define PR_ops @"15"
 #define PR_subExpressions @"16"
+#define PR_condition @"17"
 #define PR_onTrue @"18"
 #define PR_onFalse @"19"
+#define PR_left @"20"
+#define PR_right @"21"
+#define PR_expressions @"22"
 #define PR_params @"23"
 #define PR_body @"24"
 #define PR_test @"25"
@@ -103,43 +113,4 @@ typedef NS_ENUM(NSInteger, ASTType) {
 #define PR_argument @"32"
 #define PR_declarations @"33"
 
-typedef NS_ENUM(NSInteger, PropType) {
-    PR_valueType,
-    
-    
-    PR_key,
-    
-    PR_expr,
-    PR_properties,
-    
-    
-    PR_constructor,
-    
-    
-    
-    PR_subExpression,
-    PR_op,
-    
-    
-    PR_condition,
-    
-    
-    PR_left,
-    PR_right,
-    PR_expressions,
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-};
-
 #endif /* JawaExecutor_h */
diff --git a/JawaScriptExecutive-iOS/JawaExecutor.m b/JawaScriptExecutive-iOS/JawaExecutor.m
@@ -28,6 +28,8 @@ -(id)init {
         _isFromCallExpression = false;
         // TODO: Add externalCallback
         
+        jawaObjectPool = [[NSMutableArray alloc]init];
+        
         arrayPrototype = [[NSMutableDictionary alloc]init];
         stringPrototype = [[NSMutableDictionary alloc]init];
         objectPrototype = [[NSMutableDictionary alloc]init];
@@ -89,6 +91,116 @@ -(NSMutableDictionary*)invoke:(NSString *)funcName with:(NSMutableDictionary*)as
     return retJSON;
 }
 
+-(JawaObjectRef*)evalAssignmentExpression:(NSDictionary*)ast {
+    printf("Running ASSIGNMENT_EXPRESSION");
+    JawaObjectRef* left = [self evaluate:[ast objectForKey:PR_left]];
+    NSString* op = [[[ast  objectForKey:PR_op]componentsSeparatedByString:@","]objectAtIndex:1];
+    JawaObjectRef* right = [self evaluate:[ast objectForKey:PR_right]];
+    
+    if ([op isEqualToString:@"="]) {
+        if (left != nil) {
+            left.object = right != nil ? [right transfer] : nil;
+            return left;
+        } else {
+            NSDictionary* leftExpr = [ast objectForKey:PR_left];
+            JawaObjectRef* obj = [self evaluate:[leftExpr objectForKey:PR_object]];
+            if (obj != nil) {
+                int t = ((NSNumber*)[leftExpr objectForKey:@"t"]).intValue;
+                if (t == STATIC_MEMBER_EXPRESSION) {
+                    if ([obj.object isMemberOfClass:[JawaObject class]]) {
+                        NSString* property = [[leftExpr objectForKey:PR_property]objectForKey:PR_id];
+                        [(JawaObject*)obj.object setProp:property with:right];
+                        return right;
+                    }
+                } else if (t == COMPUTED_MEMBER_EXPRESSION) {
+                    if ([obj.object isMemberOfClass:[JawaObject class]]) {
+                        JawaObjectRef* computed = [self evaluate:[leftExpr objectForKey:PR_property]];
+                        if (computed == nil)
+                            [NSException raise:@"JawaScript Runtime Exception" format:@"Computed member for object is null"];
+                        NSString* property = [computed description];
+                        [(JawaObject*)obj.object setProp:property with:right];
+                        return right;
+                    }
+                }
+            }
+        }
+        [NSException raise:@"JawaScript Runtime Exception" format:@"Left operand of = is null."];
+    } else if ([op isEqualToString:@"+="]) {
+        if (left == nil)
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Left operand of += is null"];
+        if (right == nil)
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Right operand of += is null"];
+        if ([left.object isMemberOfClass:[NSMutableString class]]) {
+            NSMutableString* l = [NSMutableString stringWithString:[left.object description]];
+            NSString* r = [right description];
+            [l appendString:r];
+            left.object = [JawaObjectRef RefWithString:l in:self];
+        } else if ([left.object isMemberOfClass:[NSDecimalNumber class]] &&
+                   [right.object isMemberOfClass:[NSDecimalNumber class]]) {
+            double l = ((NSDecimalNumber*)left.object).doubleValue;
+            double r = ((NSDecimalNumber*)right.object).doubleValue;
+            left.object = [JawaObjectRef RefWithNumber:l + r in:self];
+        } else {
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Invalid type for +="];
+        }
+    } else if ([op isEqualToString:@"-="] ||
+               [op isEqualToString:@"*="] ||
+               [op isEqualToString:@"/="] ||
+               [op isEqualToString:@"%="]) {
+        if (left == nil)
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Left operand of assignment is null"];
+        if (right == nil)
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Right operand of assignment is null"];
+        if ([left.object isMemberOfClass:[NSDecimalNumber class]] &&
+            [right.object isMemberOfClass:[NSDecimalNumber class]]) {
+            double l = ((NSDecimalNumber*)left.object).doubleValue;
+            double r = ((NSDecimalNumber*)right.object).doubleValue;
+            unsigned char c = [op characterAtIndex:0];
+            switch (c) {
+                case '-':
+                    left.object = [JawaObjectRef RefWithNumber:l - r in:self];
+                    break;
+                case '*':
+                    left.object = [JawaObjectRef RefWithNumber:l * r in:self];
+                    break;
+                case '/':
+                    left.object = [JawaObjectRef RefWithNumber:l / r in:self];
+                    break;
+                case '%':
+                    left.object = [JawaObjectRef RefWithNumber:(long)l % (long)r in:self];
+                    break;
+            }
+        } else {
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Invalid type for assignment"];
+        }
+    } else if ([op isEqualToString:@"|="] ||
+               [op isEqualToString:@"&="]) {
+        if (left == nil)
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Left operand of |=,&= is null"];
+        if (right == nil)
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Right operand of |=,&= is null"];
+        if ([left.object isMemberOfClass:[NSDecimalNumber class]] &&
+            [right.object isMemberOfClass:[NSDecimalNumber class]]) {
+            long long l = ((NSDecimalNumber*)left.object).longLongValue;
+            long long r = ((NSDecimalNumber*)right.object).longLongValue;
+            unsigned char c = [op characterAtIndex:0];
+            switch (c) {
+                case '&':
+                    left.object = [JawaObjectRef RefWithNumber:l & r in:self];
+                    break;
+                case '|':
+                    left.object = [JawaObjectRef RefWithNumber:l | r in:self];
+                    break;
+            }
+        } else {
+            [NSException raise:@"JawaScript Runtime Exception" format:@"Invalid type for &=, |="];
+        }
+    } else {
+        [NSException raise:@"JawaScript Runtime Exception" format:@"%@ not implemented yet", op];
+    }
+    return nil;
+}
+
 -(JawaObjectRef*)evalStaticMemberExpression:(NSDictionary*)ast {
     printf("Running STATIC_MEMBER_EXPRESSION\n");
     JawaObjectRef* object = [self evaluate:[ast objectForKey:PR_object]];
@@ -575,7 +687,7 @@ -(JawaObjectRef*)evaluate:(NSDictionary *)tree {
         case SEQUENCE_EXPRESSION:
             break;
         case ASSIGNMENT_EXPRESSION:
-            break;
+            return [self evalAssignmentExpression:tree];
         case CONDITIONAL_EXPRESSION:
             break;
         case LOGICAL_OR_EXPRESSION:
diff --git a/JawaScriptExecutive-iOS/JawaObject.h b/JawaScriptExecutive-iOS/JawaObject.h
@@ -17,7 +17,7 @@ extern NSMutableDictionary* objectPrototype;
 {
 
 }
-@property (strong) NSMutableDictionary* properties;
+@property (strong) NSMapTable* properties;
 @property (strong) NSMutableDictionary* prototype;
 @property (weak) JawaExecutor* executor;
 
diff --git a/JawaScriptExecutive-iOS/JawaObject.m b/JawaScriptExecutive-iOS/JawaObject.m
@@ -17,7 +17,7 @@ @implementation JawaObject
 -(id) initIn:(JawaExecutor *)ex {
     self = [super init];
     if (self) {
-        _properties = [[NSMutableDictionary alloc] init];
+        _properties = [NSMapTable strongToWeakObjectsMapTable];
         _prototype = objectPrototype;
         _executor = ex;
     }
diff --git a/JawaScriptExecutive-iOS/JawaObjectProtected.h b/JawaScriptExecutive-iOS/JawaObjectProtected.h
@@ -11,7 +11,7 @@
 
 @interface JawaObject () {
     @protected
-    NSMutableDictionary* _properties;
+    NSMapTable* _properties;
     NSMutableDictionary* _prototype;
     __weak JawaExecutor* _executor;
 }
diff --git a/JawaScriptExecutive-iOS/JawaObjectRef.h b/JawaScriptExecutive-iOS/JawaObjectRef.h
@@ -15,6 +15,8 @@
 @class JawaFunc;
 @class JawaObject;
 
+extern NSMutableArray* jawaObjectPool;
+
 @interface JawaObjectRef : NSObject
 {
 
@@ -34,6 +36,7 @@
 -(id)initWithJawaObject:(JawaObject*)obj;
 -(NSString*)description;
 -(id)transfer;
+-(void)dealloc;
 
 +(id)RefIn:(JawaExecutor*)ex;
 +(id)RefWithNumber:(double)number in:(JawaExecutor*)ex;
diff --git a/JawaScriptExecutive-iOS/JawaObjectRef.m b/JawaScriptExecutive-iOS/JawaObjectRef.m
@@ -12,13 +12,16 @@
 #import "JawaFunc.h"
 #import "JawaObjectRef.h"
 
+NSMutableArray* jawaObjectPool;
+
 @implementation JawaObjectRef
 
 -(id)initIn:(JawaExecutor*)ex {
     self = [super init];
     if (self) {
         _object = NULL;
         _executor = ex;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -28,6 +31,7 @@ -(id)initWithNumber:(double)number in:(JawaExecutor*)ex {
     if (self) {
         _object = [NSDecimalNumber numberWithDouble:number];
         _executor = ex;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -37,6 +41,7 @@ -(id)initWithString:(NSString*)string in:(JawaExecutor*)ex {
     if (self) {
         _object = [NSMutableString stringWithString:string];
         _executor = ex;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -46,6 +51,7 @@ -(id)initWithBoolean:(bool)tf in:(JawaExecutor*)ex {
     if (self) {
         _object = [NSNumber numberWithBool:tf];
         _executor = ex;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -55,6 +61,7 @@ -(id)initWithJawaArray:(JawaArray*)array {
     if (self) {
         _object = array;
         _executor = array.executor;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -65,6 +72,7 @@ -(id)initWithJawaFunc:(JawaFunc*)func {
         _object = func;
         _appliedOn = nil;
         _executor = func.executor;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -75,6 +83,7 @@ -(id)initWithJawaFunc:(JawaFunc*)func on:(JawaObjectRef*)obj {
         _object = func;
         _appliedOn = obj;
         _executor = func.executor;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -84,6 +93,7 @@ -(id)initWithJawaObject:(JawaObject*)obj {
     if (self) {
         _object = obj;
         _executor = obj.executor;
+        [jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -113,6 +123,9 @@ -(id)transfer {
     } else
         return self.object;
 }
+-(void)dealloc {
+    printf("Releasing %s\n", [[self description]cStringUsingEncoding:NSUTF8StringEncoding]);
+}
 
 +(id)RefIn:(JawaExecutor *)ex {
     return [[self alloc] initIn:ex];

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ extern NSMutableDictionary* arrayPrototype;`
`17`	`17`	`{`
`18`	`18`
`19`	`19`	`}`
`20`		`-@property NSMutableArray* elements;`
	`20`	`+@property NSPointerArray* elements;`
`21`	`21`
`22`	`22`	`-(id) initIn:(JawaExecutor *)ex;`
`23`	`23`	`-(NSString*) description;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ @implementation JawaObject`
`17`	`17`	`-(id) initIn:(JawaExecutor *)ex {`
`18`	`18`	`self = [super init];`
`19`	`19`	`if (self) {`
`20`		`- _properties = [[NSMutableDictionary alloc] init];`
	`20`	`+ _properties = [NSMapTable strongToWeakObjectsMapTable];`
`21`	`21`	`_prototype = objectPrototype;`
`22`	`22`	`_executor = ex;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`@interface JawaObject () {`
`13`	`13`	`@protected`
`14`		`- NSMutableDictionary* _properties;`
	`14`	`+ NSMapTable* _properties;`
`15`	`15`	`NSMutableDictionary* _prototype;`
`16`	`16`	`__weak JawaExecutor* _executor;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,16 @@`
`12`	`12`	`#import "JawaFunc.h"`
`13`	`13`	`#import "JawaObjectRef.h"`
`14`	`14`
	`15`	`+NSMutableArray* jawaObjectPool;`
	`16`	`+`
`15`	`17`	`@implementation JawaObjectRef`
`16`	`18`
`17`	`19`	`-(id)initIn:(JawaExecutor*)ex {`
`18`	`20`	`self = [super init];`
`19`	`21`	`if (self) {`
`20`	`22`	`_object = NULL;`
`21`	`23`	`_executor = ex;`
	`24`	`+ [jawaObjectPool addObject:self];`
`22`	`25`	`}`
`23`	`26`	`return self;`
`24`	`27`	`}`
`@@ -28,6 +31,7 @@ -(id)initWithNumber:(double)number in:(JawaExecutor*)ex {`
`28`	`31`	`if (self) {`
`29`	`32`	`_object = [NSDecimalNumber numberWithDouble:number];`
`30`	`33`	`_executor = ex;`
	`34`	`+ [jawaObjectPool addObject:self];`
`31`	`35`	`}`
`32`	`36`	`return self;`
`33`	`37`	`}`
`@@ -37,6 +41,7 @@ -(id)initWithString:(NSString)string in:(JawaExecutor)ex {`
`37`	`41`	`if (self) {`
`38`	`42`	`_object = [NSMutableString stringWithString:string];`
`39`	`43`	`_executor = ex;`
	`44`	`+ [jawaObjectPool addObject:self];`
`40`	`45`	`}`
`41`	`46`	`return self;`
`42`	`47`	`}`
`@@ -46,6 +51,7 @@ -(id)initWithBoolean:(bool)tf in:(JawaExecutor*)ex {`
`46`	`51`	`if (self) {`
`47`	`52`	`_object = [NSNumber numberWithBool:tf];`
`48`	`53`	`_executor = ex;`
	`54`	`+ [jawaObjectPool addObject:self];`
`49`	`55`	`}`
`50`	`56`	`return self;`
`51`	`57`	`}`
`@@ -55,6 +61,7 @@ -(id)initWithJawaArray:(JawaArray*)array {`
`55`	`61`	`if (self) {`
`56`	`62`	`_object = array;`
`57`	`63`	`_executor = array.executor;`
	`64`	`+ [jawaObjectPool addObject:self];`
`58`	`65`	`}`
`59`	`66`	`return self;`
`60`	`67`	`}`
`@@ -65,6 +72,7 @@ -(id)initWithJawaFunc:(JawaFunc*)func {`
`65`	`72`	`_object = func;`
`66`	`73`	`_appliedOn = nil;`
`67`	`74`	`_executor = func.executor;`
	`75`	`+ [jawaObjectPool addObject:self];`
`68`	`76`	`}`
`69`	`77`	`return self;`
`70`	`78`	`}`
`@@ -75,6 +83,7 @@ -(id)initWithJawaFunc:(JawaFunc)func on:(JawaObjectRef)obj {`
`75`	`83`	`_object = func;`
`76`	`84`	`_appliedOn = obj;`
`77`	`85`	`_executor = func.executor;`
	`86`	`+ [jawaObjectPool addObject:self];`
`78`	`87`	`}`
`79`	`88`	`return self;`
`80`	`89`	`}`
`@@ -84,6 +93,7 @@ -(id)initWithJawaObject:(JawaObject*)obj {`
`84`	`93`	`if (self) {`
`85`	`94`	`_object = obj;`
`86`	`95`	`_executor = obj.executor;`
	`96`	`+ [jawaObjectPool addObject:self];`
`87`	`97`	`}`
`88`	`98`	`return self;`
`89`	`99`	`}`
`@@ -113,6 +123,9 @@ -(id)transfer {`
`113`	`123`	`} else`
`114`	`124`	`return self.object;`
`115`	`125`	`}`
	`126`	`+-(void)dealloc {`
	`127`	`+ printf("Releasing %s\n", [[self description]cStringUsingEncoding:NSUTF8StringEncoding]);`
	`128`	`+}`
`116`	`129`
`117`	`130`	`+(id)RefIn:(JawaExecutor *)ex {`
`118`	`131`	`return [[self alloc] initIn:ex];`