fix some bug

Author: yongpengliang

MangoFix.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name         = "MangoFix"
-s.version      = "1.1.0"
+s.version      = "1.1.1"
 s.summary      = "MangoFix"
 s.description  = <<-DESC
   Mango is a DSL which syntax is very similar to Objective-C，Mango is also an iOS  App hotfix SDK. You can use Mango method replace any Objective-C method.

MangoFix.xcodeproj/project.pbxproj

@@ -56,6 +56,8 @@
 		899672A1224BFE6F00C7DACB /* mango.y in Sources */ = {isa = PBXBuildFile; fileRef = 89967266224BFE6F00C7DACB /* mango.y */; };
 		899672A2224BFE6F00C7DACB /* mango.l in Sources */ = {isa = PBXBuildFile; fileRef = 89967267224BFE6F00C7DACB /* mango.l */; };
 		899672A4224BFE6F00C7DACB /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 89967269224BFE6F00C7DACB /* util.m */; };
+		89C671B3224E15050092C30F /* MFOperatorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 89C671B2224E15050092C30F /* MFOperatorTest.m */; };
+		89C671B5224E152D0092C30F /* MFOperatorTest.mg in Resources */ = {isa = PBXBuildFile; fileRef = 89C671B4224E152D0092C30F /* MFOperatorTest.mg */; };
 		89F96106224CDF2200ADFF07 /* MFAddGlobalVarTest.mg in Resources */ = {isa = PBXBuildFile; fileRef = 89F96105224CDF2200ADFF07 /* MFAddGlobalVarTest.mg */; };
 		89F96109224CDF3D00ADFF07 /* MFAddGlobalVarTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 89F96108224CDF3D00ADFF07 /* MFAddGlobalVarTest.m */; };
 		89F9610C224CE3F200ADFF07 /* MFObjectPropertyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 89F9610B224CE3F200ADFF07 /* MFObjectPropertyTest.m */; };
@@ -169,6 +171,9 @@
 		89967268224BFE6F00C7DACB /* MangoFix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MangoFix.h; sourceTree = "<group>"; };
 		89967269224BFE6F00C7DACB /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = util.m; sourceTree = "<group>"; };
 		8996726A224BFE6F00C7DACB /* MFContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFContext.h; sourceTree = "<group>"; };
+		89C671B1224E15050092C30F /* MFOperatorTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MFOperatorTest.h; sourceTree = "<group>"; };
+		89C671B2224E15050092C30F /* MFOperatorTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MFOperatorTest.m; sourceTree = "<group>"; };
+		89C671B4224E152D0092C30F /* MFOperatorTest.mg */ = {isa = PBXFileReference; lastKnownFileType = text; path = MFOperatorTest.mg; sourceTree = "<group>"; };
 		89F96105224CDF2200ADFF07 /* MFAddGlobalVarTest.mg */ = {isa = PBXFileReference; lastKnownFileType = text; path = MFAddGlobalVarTest.mg; sourceTree = "<group>"; };
 		89F96107224CDF3D00ADFF07 /* MFAddGlobalVarTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MFAddGlobalVarTest.h; sourceTree = "<group>"; };
 		89F96108224CDF3D00ADFF07 /* MFAddGlobalVarTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MFAddGlobalVarTest.m; sourceTree = "<group>"; };
@@ -265,6 +270,9 @@
 				895EC4E6224CC2C90062CBF8 /* MFConditionalReplaceTest.h */,
 				895EC4E7224CC2C90062CBF8 /* MFConditionalReplaceTest.m */,
 				8977D892224CD3FA0048A954 /* MFConditionalReplaceTest.mg */,
+				89C671B1224E15050092C30F /* MFOperatorTest.h */,
+				89C671B2224E15050092C30F /* MFOperatorTest.m */,
+				89C671B4224E152D0092C30F /* MFOperatorTest.mg */,
 				89FC7DB3224C058200AFC0AC /* MFSequentialStatementTest.h */,
 				89FC7DB1224C058200AFC0AC /* MFSequentialStatementTest.m */,
 				89FC7DB0224C058200AFC0AC /* MFSequentialStatementTest.mg */,
@@ -506,6 +514,7 @@
 				8977D897224CD4BD0048A954 /* MFGCDTest.mg in Resources */,
 				89F96113224CE9C700ADFF07 /* MFOriginalMethodTest.mg in Resources */,
 				8977D88D224CCF200048A954 /* MFClassMethodReplaceTest.mg in Resources */,
+				89C671B5224E152D0092C30F /* MFOperatorTest.mg in Resources */,
 				8977D895224CD4520048A954 /* MFCustomStructDeclareTest.mg in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -553,6 +562,7 @@
 				895EC4E8224CC2C90062CBF8 /* MFConditionalReplaceTest.m in Sources */,
 				89F9610C224CE3F200ADFF07 /* MFObjectPropertyTest.m in Sources */,
 				899671A3224BFD2A00C7DACB /* MangoFixTests.m in Sources */,
+				89C671B3224E15050092C30F /* MFOperatorTest.m in Sources */,
 				89FC7DB5224C058200AFC0AC /* MFSequentialStatementTest.m in Sources */,
 				895EC4EE224CC3B10062CBF8 /* MFClassMethodReplaceTest.m in Sources */,
 				895EC4E2224CC1E30062CBF8 /* MFLoopStatementTest.m in Sources */,

MangoFix/Compiler/lex_yacc/mango.l

@@ -189,7 +189,7 @@ static void increment_line_number(){
 
 
 
-<INITIAL>[-+]?[1-9][0-9]* {
+<INITIAL>[1-9][0-9]* {
 	MFExpression *expression = mf_create_expression(MF_INT_EXPRESSION);
 	NSInteger val;
 	sscanf(yytext,"%ld",&val);
@@ -218,7 +218,7 @@ static void increment_line_number(){
 }
 
 
-<INITIAL>[-+]?[0-9]+\.[0-9]+ {
+<INITIAL>[0-9]+\.[0-9]+ {
 	MFExpression *expression = mf_create_expression(MF_DOUBLE_EXPRESSION);
 	double val;
 	sscanf(yytext,"%lf",&val);

MangoFix/Execute/eval.m

@@ -784,6 +784,8 @@ static void eval_negative_expression(MFInterpreter *inter, MFScopeChain *scope,M
 			NSCAssert(0, @"line:%zd operator ‘-’ can not use type: %@",expr.expr.lineNumber, value.type.typeName);
 			break;
 	}
+    [inter.stack push:resultValue];
+    
 }
 
 

MangoFixDemo/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - MangoFix (1.1.0)
+  - MangoFix (1.1.1)
 
 DEPENDENCIES:
   - MangoFix (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  MangoFix: bbab26da2386881b2e6983138e372830e4e29263
+  MangoFix: 5948edb6ce3b979c5aa55cc3f6fd344320cb34cb
 
 PODFILE CHECKSUM: 34961e3ae86f606667df9385af573565446ef99d
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1

MangoFixTests/MFOperatorTest.h

@@ -0,0 +1,19 @@
+//
+//  MFOperatorTest.h
+//  MangoFixTests
+//
+//  Created by yongpengliang on 2019/3/29.
+//  Copyright © 2019 yongpengliang. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MFOperatorTest : NSObject
+
+- (BOOL)testOperator;
+
+@end
+
+NS_ASSUME_NONNULL_END

MangoFixTests/MFOperatorTest.m

@@ -0,0 +1,17 @@
+//
+//  MFOperatorTest.m
+//  MangoFixTests
+//
+//  Created by yongpengliang on 2019/3/29.
+//  Copyright © 2019 yongpengliang. All rights reserved.
+//
+
+#import "MFOperatorTest.h"
+
+@implementation MFOperatorTest
+
+- (BOOL)testOperator{
+    return NO;
+}
+
+@end

MangoFixTests/MFOperatorTest.mg

@@ -0,0 +1,96 @@
+
+class MFOperatorTest : NSObject {
+
+- (BOOL)testOperator{
+    int a = 10;
+    int b = 20;
+    BOOL c = NO;
+    a = a + b;
+    if (a != 30) {
+    return NO;
+    }
+
+    a = a - b;
+    if (a != 10) {
+    return NO;
+    }
+
+    a = a * b;
+    if (a != 200) {
+    return NO;
+    }
+
+    a = a/b;
+    if (a != 10) {
+    return 10;
+    }
+
+    a = a % 3;
+    if (a != 1) {
+    return  NO;
+    }
+
+    a = -a;
+    if (a != -1) {
+    return NO;
+    }
+
+    a += 11;
+    if (a != 10) {
+    return NO;
+    }
+
+    a -= 5;
+    if (a != 5) {
+    return NO;
+    }
+
+    a *= 10;
+    if (a != 50) {
+    return NO;
+    }
+
+    a /= 3;
+    if (a != 16) {
+    return NO;
+    }
+
+    a %= 5;
+    if (a != 1) {
+    return NO;
+    }
+
+    a++;
+    if (a != 2) {
+    return NO;
+    }
+
+    a--;
+    if (a != 1) {
+    return NO;
+    }
+
+    c = a == 1;
+    if (!c) {
+    return NO;
+    }
+
+    c = !c;
+    if (c) {
+    return NO;
+    }
+
+    c = c || YES;
+    if (!c) {
+    return NO;
+    }
+
+    c = c && NO;
+    if (c) {
+    return NO;
+    }
+
+    return YES;
+}
+
+}

MangoFixTests/MangoFixTests.m

@@ -15,6 +15,7 @@
 #import "MFSuperMethodReplaceTest.h"
 #import "MFAddGlobalVarTest.h"
 #import "MFConditionalReplaceTest.h"
+#import "MFOperatorTest.h"
 #import "MFSequentialStatementTest.h"
 #import "MFBranchStatementTest.h"
 #import "MFLoopStatementTest.h"
@@ -85,6 +86,12 @@ - (void)testConditionalReplace{
     XCTAssert([conditionalReplaceTest testConditionalReplace],@"conditionalReplaceTest");
 }
 
+- (void)testOperator{
+    [self loadMango:@"MFOperatorTest"];
+    MFOperatorTest *operatorTest = [[MFOperatorTest alloc] init];
+    XCTAssert([operatorTest testOperator],@"operatorTest");
+}
+
 
 - (void)testSequentialStatement{
     [self loadMango:@"MFSequentialStatementTest"];