优化代码

Author: ownit

Makefile.win

@@ -6,12 +6,12 @@ CC       = gcc.exe -D__DEBUG__
 WINDRES  = windres.exe
 OBJ      = src/Parser.o src/Base.o src/PyObj.o src/ExprAST.o src/main.o src/Scanner.o src/objhandler/PyBoolHandler.o src/objhandler/PyFloatHandler.o src/objhandler/PyIntHandler.o src/objhandler/PyFuncHandler.o src/objhandler/PyTupleHandler.o src/objhandler/PyDictHandler.o src/objhandler/PyStrHandler.o src/objhandler/PyClassHandler.o src/objhandler/PyClassInstanceHandler.o src/objhandler/PyModHandler.o src/SPython.o src/Util.o src/objhandler/PyCommonHandler.o src/objhandler/PyListHandler.o
 LINKOBJ  = src/Parser.o src/Base.o src/PyObj.o src/ExprAST.o src/main.o src/Scanner.o src/objhandler/PyBoolHandler.o src/objhandler/PyFloatHandler.o src/objhandler/PyIntHandler.o src/objhandler/PyFuncHandler.o src/objhandler/PyTupleHandler.o src/objhandler/PyDictHandler.o src/objhandler/PyStrHandler.o src/objhandler/PyClassHandler.o src/objhandler/PyClassInstanceHandler.o src/objhandler/PyModHandler.o src/SPython.o src/Util.o src/objhandler/PyCommonHandler.o src/objhandler/PyListHandler.o
-LIBS     = -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib" -static-libgcc -pg -g3
+LIBS     = -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib" -static-libgcc -g3
 INCS     = -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"./include"
 CXXINCS  = -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include/c++" -I"./include"
 BIN      = spython.exe
-CXXFLAGS = $(CXXINCS) -Wall -pg -g3
-CFLAGS   = $(INCS) -Wall -pg -g3
+CXXFLAGS = $(CXXINCS) -g3
+CFLAGS   = $(INCS) -g3
 RM       = rm.exe -f
 
 .PHONY: all all-before all-after clean clean-custom

spython.dev

@@ -23,12 +23,12 @@ OverrideOutputName=spython.exe
 HostApplication=
 UseCustomMakefile=0
 CustomMakefile=
-CommandLine=pysrc/main.py
+CommandLine=test.py
 Folders=include,include/ext,include/objhandler,src,src/objhandler
 IncludeVersionInfo=0
 SupportXPThemes=0
-CompilerSet=2
-CompilerSettings=0000000000100000101000000
+CompilerSet=1
+CompilerSettings=0000000000000000001000000
 UnitCount=59
 
 [VersionInfo]

spython.layout

@@ -1,25 +1,25 @@
 [Editors]
-Order=51,10,50,52,57,34,9,8,36,35,2,5,1,11,12,58,38,7,6,20,26
-Focused=12
+Order=51,10,50,52,57,34,9,8,36,35,2,5,1,11,12,58,38,7,6,20,26,4
+Focused=6
 [Editor_0]
 CursorCol=1
 CursorRow=243
 TopLine=220
 LeftChar=1
 [Editor_1]
-CursorCol=36
-CursorRow=1422
-TopLine=1423
+CursorCol=32
+CursorRow=989
+TopLine=978
 LeftChar=1
 [Editor_2]
 CursorCol=1
 CursorRow=149
-TopLine=517
+TopLine=138
 LeftChar=1
 [Editor_4]
 CursorCol=1
 CursorRow=204
-TopLine=188
+TopLine=191
 LeftChar=1
 [Editor_5]
 CursorCol=1
@@ -32,14 +32,14 @@ CursorRow=43
 TopLine=24
 LeftChar=1
 [Editor_11]
-CursorCol=23
-CursorRow=67
-TopLine=51
+CursorCol=1
+CursorRow=44
+TopLine=30
 LeftChar=1
 [Editor_12]
-CursorCol=55
-CursorRow=166
-TopLine=147
+CursorCol=1
+CursorRow=479
+TopLine=475
 LeftChar=1
 [Editor_13]
 CursorCol=55
@@ -52,24 +52,24 @@ CursorRow=19
 TopLine=9
 LeftChar=1
 [Editor_6]
-CursorCol=77
-CursorRow=190
-TopLine=185
+CursorCol=1
+CursorRow=442
+TopLine=429
 LeftChar=1
 [Editor_7]
-CursorCol=23
-CursorRow=575
-TopLine=564
+CursorCol=1
+CursorRow=551
+TopLine=594
 LeftChar=1
 [Editor_8]
 CursorCol=1
-CursorRow=791
-TopLine=776
+CursorRow=95
+TopLine=75
 LeftChar=1
 [Editor_9]
 CursorCol=1
-CursorRow=229
-TopLine=218
+CursorRow=160
+TopLine=148
 LeftChar=1
 [Editor_15]
 CursorCol=74
@@ -87,9 +87,9 @@ CursorRow=21
 TopLine=1
 LeftChar=1
 [Editor_20]
-CursorCol=29
+CursorCol=1
 CursorRow=24
-TopLine=1
+TopLine=4
 LeftChar=1
 [Editor_17]
 CursorCol=16
@@ -192,9 +192,9 @@ CursorRow=38
 TopLine=21
 LeftChar=1
 [Editor_38]
-CursorCol=61
-CursorRow=210
-TopLine=195
+CursorCol=19
+CursorRow=157
+TopLine=145
 LeftChar=1
 [Editor_39]
 CursorCol=19
@@ -252,9 +252,9 @@ CursorRow=119
 TopLine=107
 LeftChar=1
 [Editor_50]
-CursorCol=1
-CursorRow=13
-TopLine=8
+CursorCol=8
+CursorRow=14
+TopLine=14
 LeftChar=1
 [Editor_51]
 CursorCol=19

src/ExprAST.cpp

@@ -84,14 +84,11 @@ PyObjPtr& PowerAST::eval(PyContext& context){TRACE_EXPR();
     return merge->eval(context);
 }
 PyObjPtr& StmtAST::eval(PyContext& context){TRACE_EXPR();
-    if (exprs.empty()){
-        return context.cacheResult(PyObjTool::buildNone());
-    }
-    unsigned int i = 0;
-    for (; i < exprs.size() - 1; ++i){
+    size_t size = exprs.size();
+    for (size_t i = 0; i < size; ++i){
         exprs[i]->eval(context);
     }
-    return exprs[i]->eval(context);
+    return context.cacheResult(PyObjTool::buildNone());
 }
 
 PyObjPtr& PrintAST::eval(PyContext& context){TRACE_EXPR();