remove libpypa

.gitmodules

@@ -22,9 +22,6 @@
 	path = build_deps/libunwind
 	url = https://github.com/pathscale/libunwind.git
 	ignore = all
-[submodule "build_deps/libpypa"]
-	path = build_deps/libpypa
-	url = git://github.com/vinzenz/libpypa.git
 [submodule "build_deps/lz4"]
 	path = build_deps/lz4
 	url = git://github.com/Cyan4973/lz4.git

CMakeLists.txt

@@ -244,10 +244,6 @@ SET_SOURCE_FILES_PROPERTIES(
     ${CMAKE_BINARY_DIR}/build_deps/libunwind/include/libunwind.h PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/build_deps/libunwind/pyston_patched
 )
 
-# libpypa
-add_subdirectory(build_deps/libpypa EXCLUDE_FROM_ALL)
-add_dependencies(pypa gitsubmodules)
-
 # lz4
 add_subdirectory(build_deps/lz4/cmake_unofficial EXCLUDE_FROM_ALL)
 add_dependencies(lz4 gitsubmodules)
@@ -317,13 +313,9 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/linkdeps_dummy.c COMMAND ${CMAKE_C
 add_executable(pyston $<TARGET_OBJECTS:PYSTON_MAIN_OBJECT> $<TARGET_OBJECTS:PYSTON_OBJECTS> $<TARGET_OBJECTS:FROM_CPYTHON> linkdeps_dummy.c)
 # Wrap the stdlib in --whole-archive to force all the symbols to be included and eventually exported
 
-target_link_libraries(pyston -Wl,--whole-archive stdlib -Wl,--no-whole-archive pthread m z readline sqlite3 gmp mpfr ssl crypto unwind pypa liblz4 double-conversion util ${LLVM_LIBS} ${LIBLZMA_LIBRARIES} ${OPTIONAL_LIBRARIES} ${CMAKE_BINARY_DIR}/jemalloc/lib/libjemalloc.a)
+target_link_libraries(pyston -Wl,--whole-archive stdlib -Wl,--no-whole-archive pthread m z readline sqlite3 gmp mpfr ssl crypto unwind liblz4 util ${LLVM_LIBS} ${LIBLZMA_LIBRARIES} ${OPTIONAL_LIBRARIES} ${CMAKE_BINARY_DIR}/jemalloc/lib/libjemalloc.a)
 add_dependencies(pyston libjemalloc)
 
-add_custom_target(astcompare COMMAND ${CMAKE_SOURCE_DIR}/tools/astprint_test.sh
-                  DEPENDS astprint
-                  COMMENT "Running libpypa vs CPython AST result comparison test")
-
 # test
 enable_testing()
 set(TEST_THREADS 1 CACHE STRING "number of pyston test threads")
@@ -339,9 +331,9 @@ endmacro()
 
 # tests         testname directory arguments
 add_pyston_test(defaults tests --order-by-mtime -t50)
-add_pyston_test(force_llvm tests -a=-n -a=-x -t90)
+add_pyston_test(force_llvm tests -a=-n -t90)
 if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
-  add_pyston_test(max_compilation_tier tests -a=-O -a=-x -t50)
+  add_pyston_test(max_compilation_tier tests -a=-O -t50)
 endif()
 add_pyston_test(defaults cpython --exit-code-only --skip-failing -t100)
 add_pyston_test(defaults integration --exit-code-only --skip-failing -t900)

Makefile

@@ -130,7 +130,6 @@ COMMON_CXXFLAGS += -Woverloaded-virtual
 COMMON_CXXFLAGS += -fexceptions -fno-rtti
 COMMON_CXXFLAGS += -Wno-invalid-offsetof # allow the use of "offsetof", and we'll just have to make sure to only use it legally.
 COMMON_CXXFLAGS += -DENABLE_INTEL_JIT_EVENTS=$(ENABLE_INTEL_JIT_EVENTS)
-COMMON_CXXFLAGS += -I$(DEPS_DIR)/pypa-install/include
 COMMON_CXXFLAGS += -I$(DEPS_DIR)/lz4-install/include
 
 ifeq ($(ENABLE_VALGRIND),0)
@@ -147,7 +146,6 @@ COMMON_CXXFLAGS += -DGITREV=$(shell git rev-parse HEAD | head -c 12) -DLLVMREV=$
 
 # Use our "custom linker" that calls gold if available
 COMMON_LDFLAGS := -B$(TOOLS_DIR)/build_system -L/usr/local/lib -lpthread -lm -lunwind -llzma -L$(DEPS_DIR)/gcc-4.8.2-install/lib64 -lreadline -lgmp -lssl -lcrypto -lsqlite3
-COMMON_LDFLAGS += $(DEPS_DIR)/pypa-install/lib/libpypa.a
 COMMON_LDFLAGS += $(DEPS_DIR)/lz4-install/lib/liblz4.a
 
 # Conditionally add libtinfo if available - otherwise nothing will be added
@@ -501,18 +499,6 @@ $(TOOLS_DIR)/publicize_release: $(TOOLS_DIR)/publicize.release.o $(LLVM_RELEASE_
 	$(ECHO) Linking $(TOOLS_DIR)/publicize_release
 	$(VERB) $(CXX) $< $(LDFLAGS_RELEASE) -o $@ -lLLVMBitWriter
 
-$(TOOLS_DIR)/astprint: $(TOOLS_DIR)/astprint.cpp $(BUILD_SYSTEM_DEPS) $(LLVM_DEPS) $(ASTPRINT_OBJS)
-	$(ECHO) Linking $(TOOLS_DIR)/astprint
-	$(VERB) $(CXX) $< -o $@ $(LLVM_LIB_DEPS) $(ASTPRINT_OBJS) $(LDFLAGS) $(STDLIB_SRCS:.cpp=.o) $(CXXFLAGS_DBG)
-
-.PHONY: astprint astcompare
-
-astprint: $(TOOLS_DIR)/astprint
-
-astcompare: astprint
-	$(ECHO) Running libpypa vs CPython AST result comparison test
-	$(TOOLS_DIR)/astprint_test.sh && echo "Success" || echo "Failure"
-
 ## END OF TOOLS
 
 
@@ -777,7 +763,7 @@ check$1 test$1: $(PYTHON_EXE_DEPS) pyston$1
 	@# we pass -I to cpython tests and skip failing ones because they are sloooow otherwise
 	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-S -k --exit-code-only --skip-failing -t50 $(TEST_DIR)/cpython $(ARGS)
 	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -k -a=-S --exit-code-only --skip-failing -t600 $(TEST_DIR)/integration $(ARGS)
-	$(PYTHON) $(TOOLS_DIR)/tester.py -a=-x -R pyston$1 -j$(TEST_THREADS) -a=-n -a=-S -t50 -k $(TESTS_DIR) $(ARGS)
+	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-n -a=-S -t50 -k $(TESTS_DIR) $(ARGS)
 	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-O -a=-S -k $(TESTS_DIR) $(ARGS)
 
 .PHONY: run$1 dbg$1
@@ -1074,7 +1060,7 @@ superlint: plugins/clang_linter.so
 .PHONY: lint_%
 lint_%: %.cpp plugins/clang_linter.so
 	$(ECHO) Linting $<
-	$(VERB) $(CLANG_CXX) -Xclang -load -Xclang plugins/clang_linter.so -Xclang -plugin -Xclang pyston-linter src/runtime/float.cpp $< -c -Isrc/ -Ifrom_cpython/Include -Ibuild/Debug/from_cpython/Include $(shell $(LLVM_BIN_DBG)/llvm-config --cxxflags) $(COMMON_CXXFLAGS) -no-pedantic -Wno-unused-variable -DNVALGRIND -Wno-invalid-offsetof -Wno-mismatched-tags -Wno-unused-function -Wno-unused-private-field -Wno-sign-compare -DLLVMREV=$(LLVM_REVISION) -Ibuild_deps/lz4/lib -DBINARY_SUFFIX= -DBINARY_STRIPPED_SUFFIX=_stripped  -Ibuild_deps/libpypa/src/ -Wno-covered-switch-default -Ibuild/Debug/libunwind/include -Wno-extern-c-compat -Wno-unused-local-typedef -Wno-inconsistent-missing-override
+	$(VERB) $(CLANG_CXX) -Xclang -load -Xclang plugins/clang_linter.so -Xclang -plugin -Xclang pyston-linter src/runtime/float.cpp $< -c -Isrc/ -Ifrom_cpython/Include -Ibuild/Debug/from_cpython/Include $(shell $(LLVM_BIN_DBG)/llvm-config --cxxflags) $(COMMON_CXXFLAGS) -no-pedantic -Wno-unused-variable -DNVALGRIND -Wno-invalid-offsetof -Wno-mismatched-tags -Wno-unused-function -Wno-unused-private-field -Wno-sign-compare -DLLVMREV=$(LLVM_REVISION) -Ibuild_deps/lz4/lib -DBINARY_SUFFIX= -DBINARY_STRIPPED_SUFFIX=_stripped -Ibuild/Debug/libunwind/include -Wno-extern-c-compat -Wno-unused-local-typedef -Wno-inconsistent-missing-override
 
 REFCOUNT_CHECKER_BUILD_PATH := $(CMAKE_DIR_DBG)/plugins/refcount_checker/llvm/bin/refcount_checker
 REFCOUNT_CHECKER_RUN_PATH := $(CMAKE_DIR_DBG)/llvm/bin/refcount_checker

README.md

@@ -136,9 +136,6 @@ Pyston-specific flags:
 <dt>-r</dt>
   <dd>Use a stripped stdlib.  When running pyston_dbg, the default is to use a stdlib with full debugging symbols enabled.  Passing -r changes this behavior to load a slimmer, stripped stdlib.</dd>
 
-<dt>-x</dt>
-  <dd>Enable the pypa parser.</dd>
-
 Standard Python flags:
 <dt>-i</dt>
   <dd>Go into the repl after executing the given script.</dd>

libpypa @ 40eb32aa

-Subproject commit 40eb32aa846b21e122cfa1f10bf8972e67de14c8

from_cpython/Lib/test/test_bytes.py

-# expected: fail
-# this trips an assert in pypa-parser.cpp
-
 """Unit tests for the bytes and bytearray types.
 
 XXX This is a mess.  Common tests should be moved to buffer_tests.py,

from_cpython/Lib/test/test_complex.py

@@ -474,10 +474,8 @@ class ComplexTest(unittest.TestCase):
         self.assertEqual(repr(complex(0, -INF)), "-infj")
         self.assertEqual(repr(complex(0, NAN)), "nanj")
 
-    # Pyston change: This is a libpypa bug, waiting for upstream fix it
-    # please refer libpypa#47
-    # def test_neg(self):
-    #     self.assertEqual(-(1+6j), -1-6j)
+    def test_neg(self):
+        self.assertEqual(-(1+6j), -1-6j)
 
     def test_file(self):
         a = 3.33+4.43j

src/CMakeLists.txt

@@ -7,7 +7,6 @@ set_source_files_properties(jit.cpp PROPERTIES COMPILE_DEFINITIONS "GITREV=${GIT
 
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_BINARY_DIR}/build_deps/libunwind/include)
-include_directories(${CMAKE_SOURCE_DIR}/build_deps/libpypa/src)
 include_directories(${CMAKE_SOURCE_DIR}/build_deps/lz4/lib)
 
 if(ENABLE_GPERFTOOLS)
@@ -60,7 +59,6 @@ add_library(PYSTON_OBJECTS OBJECT ${OPTIONAL_SRCS}
 		codegen/patchpoints.cpp
 		codegen/profiling/dumprof.cpp
 		codegen/profiling/profiling.cpp
-		codegen/pypa-parser.cpp
 		codegen/runtime_hooks.cpp
 		codegen/serialize_ast.cpp
 		codegen/stackmaps.cpp
@@ -109,10 +107,10 @@ add_library(PYSTON_OBJECTS OBJECT ${OPTIONAL_SRCS}
 		runtime/util.cpp
 		)
 
-add_dependencies(PYSTON_OBJECTS copy_stdlib libunwind_patched libunwind pypa ${LLVM_LIBS})
+add_dependencies(PYSTON_OBJECTS copy_stdlib libunwind_patched libunwind ${LLVM_LIBS})
 
 add_library(PYSTON_MAIN_OBJECT OBJECT jit.cpp)
-add_dependencies(PYSTON_MAIN_OBJECT copy_stdlib libunwind_patched libunwind pypa liblz4 ${LLVM_LIBS})
+add_dependencies(PYSTON_MAIN_OBJECT copy_stdlib libunwind_patched libunwind liblz4 ${LLVM_LIBS})
 
 # build stdlib
 add_subdirectory(runtime/inline)

src/codegen/parser.cpp

@@ -27,7 +27,6 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
-#include "codegen/pypa-parser.h"
 #include "codegen/serialize_ast.h"
 #include "core/ast.h"
 #include "core/options.h"
@@ -1001,11 +1000,6 @@ AST* readASTMisc(BufferedReader* reader) {
 AST_Module* parse_string(const char* code, FutureFlags inherited_flags) {
     inherited_flags &= ~(CO_NESTED | CO_FUTURE_DIVISION);
 
-    if (ENABLE_PYPA_PARSER) {
-        AST_Module* rtn = pypa_parse_string(code, inherited_flags);
-        RELEASE_ASSERT(rtn, "unknown parse error (possibly: '%s'?)", strerror(errno));
-        return rtn;
-    }
     PyCompilerFlags cf;
     cf.cf_flags = inherited_flags;
     ArenaWrapper arena;
@@ -1022,11 +1016,6 @@ AST_Module* parse_string(const char* code, FutureFlags inherited_flags) {
 AST_Module* parse_file(const char* fn, FutureFlags inherited_flags) {
     Timer _t("parsing");
 
-    if (ENABLE_PYPA_PARSER) {
-        AST_Module* rtn = pypa_parse(fn, inherited_flags);
-        RELEASE_ASSERT(rtn, "unknown parse error (possibly: '%s'?)", strerror(errno));
-        return rtn;
-    }
     FileHandle fp(fn, "r");
     PyCompilerFlags cf;
     cf.cf_flags = inherited_flags;
@@ -1084,21 +1073,16 @@ static std::vector<char> _reparse(const char* fn, const std::string& cache_fn, A
     file_data.insert(file_data.end(), (char*)&checksum, (char*)&checksum + CHECKSUM_LENGTH);
     checksum = 0;
 
-    if (ENABLE_PYPA_PARSER) {
-        module = pypa_parse(fn, inherited_flags);
-        RELEASE_ASSERT(module, "unknown parse error");
-    } else {
-        FileHandle fp(fn, "r");
-        PyCompilerFlags cf;
-        cf.cf_flags = inherited_flags;
-        ArenaWrapper arena;
-        assert(arena);
-        mod_ty mod = PyParser_ASTFromFile(fp, fn, Py_file_input, 0, 0, &cf, NULL, arena);
-        if (!mod)
-            throwCAPIException();
-        assert(mod->kind != Interactive_kind);
-        module = static_cast<AST_Module*>(cpythonToPystonAST(mod, fn));
-    }
+    FileHandle fp(fn, "r");
+    PyCompilerFlags cf;
+    cf.cf_flags = inherited_flags;
+    ArenaWrapper arena;
+    assert(arena);
+    mod_ty mod = PyParser_ASTFromFile(fp, fn, Py_file_input, 0, 0, &cf, NULL, arena);
+    if (!mod)
+        throwCAPIException();
+    assert(mod->kind != Interactive_kind);
+    module = static_cast<AST_Module*>(cpythonToPystonAST(mod, fn));
 
     if (!cache_fp)
         return std::vector<char>();
@@ -1123,10 +1107,6 @@ static std::vector<char> _reparse(const char* fn, const std::string& cache_fn, A
 // on the startup time (40ms -> 10ms).
 AST_Module* caching_parse_file(const char* fn, FutureFlags inherited_flags) {
     std::ostringstream oss;
-    if (DEBUG_PARSING) {
-        oss << "caching_parse_file() on " << fn << '\n';
-        fprintf(stderr, "caching_parse_file('%s'), pypa=%d\n", fn, ENABLE_PYPA_PARSER);
-    }
 
     UNAVOIDABLE_STAT_TIMER(t0, "us_timer_caching_parse_file");
     static StatCounter us_parsing("us_parsing");

src/codegen/pypa-parser.h

-// Copyright (c) 2014-2016 Dropbox, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef PYSTON_CODEGEN_PYPAPARSER_H
-#define PYSTON_CODEGEN_PYPAPARSER_H
-
-#include <cstdio>
-
-#include "core/types.h"
-
-namespace pyston {
-class AST_Module;
-AST_Module* pypa_parse(char const* file_path, FutureFlags future_flags);
-AST_Module* pypa_parse_string(char const* str, FutureFlags future_flags);
-}
-
-#endif // PYSTON_CODEGEN_PYPAPARSER_H

src/core/cfg.cpp

@@ -2362,21 +2362,6 @@ public:
 
     bool visit_tryexcept(AST_TryExcept* node) override {
         assert(curblock);
-
-        // The pypa parser will generate a tryexcept node inside a try-finally block with
-        // no except clauses
-        if (node->handlers.size() == 0) {
-            assert(ENABLE_PYPA_PARSER);
-            assert(node->orelse.size() == 0);
-
-            for (AST_stmt* subnode : node->body) {
-                subnode->accept(this);
-                if (!curblock)
-                    break;
-            }
-            return true;
-        }
-
         assert(node->handlers.size() > 0);
 
         CFGBlock* exc_handler_block = cfg->addDeferredBlock();

src/core/options.cpp

@@ -38,7 +38,6 @@ bool PROFILE = false;
 bool DUMPJIT = false;
 bool TRAP = false;
 bool USE_STRIPPED_STDLIB = true; // always true
-bool ENABLE_PYPA_PARSER = false;
 bool USE_REGALLOC_BASIC = false;
 bool PAUSE_AT_ABORT = false;
 bool ENABLE_TRACEBACKS = true;

src/core/options.h

@@ -36,8 +36,8 @@ extern int SPECULATION_THRESHOLD;
 extern int MAX_OBJECT_CACHE_ENTRIES;
 
 extern bool SHOW_DISASM, FORCE_INTERPRETER, FORCE_OPTIMIZE, PROFILE, DUMPJIT, TRAP, USE_STRIPPED_STDLIB,
-    CONTINUE_AFTER_FATAL, ENABLE_INTERPRETER, ENABLE_BASELINEJIT, ENABLE_PYPA_PARSER, USE_REGALLOC_BASIC,
-    PAUSE_AT_ABORT, ENABLE_TRACEBACKS, FORCE_LLVM_CAPI_CALLS, FORCE_LLVM_CAPI_THROWS;
+    CONTINUE_AFTER_FATAL, ENABLE_INTERPRETER, ENABLE_BASELINEJIT, USE_REGALLOC_BASIC, PAUSE_AT_ABORT, ENABLE_TRACEBACKS,
+    FORCE_LLVM_CAPI_CALLS, FORCE_LLVM_CAPI_THROWS;
 
 extern bool LOG_IC_ASSEMBLY, LOG_BJIT_ASSEMBLY;
 

src/jit.cpp

@@ -219,8 +219,6 @@ int handleArg(char code) {
         USE_STRIPPED_STDLIB = true;
     } else if (code == 'b') {
         USE_REGALLOC_BASIC = false;
-    } else if (code == 'x') {
-        ENABLE_PYPA_PARSER = true;
     } else if (code == 'E') {
         Py_IgnoreEnvironmentFlag = 1;
     } else if (code == 'P') {

test/CPYTHON_TEST_NOTES.md

@@ -10,7 +10,6 @@ The CPython tests I've included fail for various reasons. Recurring issues inclu
 - missing `__name__` attributes on capifuncs
 - missing `sys.__stdout__` attribute
 - `serialize_ast.cpp`: `writeColOffset: assert(v < 100000 || v == -1)` gets tripped
-- `pypa-parser.cpp`: readName: `assert(e.type == pypa::AstType::Name)`
 - `src/runtime/util.cpp`: `parseSlice`: `assert(isSubclass(start->cls, int_cls) || start->cls == none_cls)`
 
 ## List of files & why they're failing

test/tests/property.py

-# I think pypa has an issue parsing decorator expressions if they aren't simple names
-# https://github.com/vinzenz/libpypa/issues/15
-
 class C(object):
     def fget(self):
         return 5

test/unittests/CMakeLists.txt

@@ -9,7 +9,7 @@ add_custom_target(unittests)
 
 macro(add_unittest unittest)
   add_executable(${unittest}_unittest EXCLUDE_FROM_ALL ${unittest}.cpp $<TARGET_OBJECTS:PYSTON_OBJECTS> $<TARGET_OBJECTS:FROM_CPYTHON>)
-  target_link_libraries(${unittest}_unittest stdlib z sqlite3 gmp mpfr ssl crypto readline pypa liblz4 double-conversion unwind gtest gtest_main util ${LLVM_LIBS} ${LIBLZMA_LIBRARIES})
+  target_link_libraries(${unittest}_unittest stdlib z sqlite3 gmp mpfr ssl crypto readline liblz4 unwind gtest gtest_main util ${LLVM_LIBS} ${LIBLZMA_LIBRARIES})
   add_dependencies(unittests ${unittest}_unittest)
 endmacro()
 

tools/CMakeLists.txt

@@ -5,8 +5,3 @@ llvm_map_components_to_libnames(LLVM_LIBS_EXTRA BitWriter)
 
 add_executable(publicize publicize.cpp)
 target_link_libraries(publicize curses dl pthread ${LLVM_LIBS} ${LLVM_LIBS_EXTRA}) 
-
-include_directories(${CMAKE_SOURCE_DIR}/src)
-add_executable(astprint EXCLUDE_FROM_ALL astprint.cpp $<TARGET_OBJECTS:PYSTON_OBJECTS> $<TARGET_OBJECTS:FROM_CPYTHON>)
-target_link_libraries(astprint stdlib gmp ssl crypto readline pypa double-conversion unwind ${LLVM_LIBS} ${LIBLZMA_LIBRARIES})
-  

tools/astprint.cpp

-#include "analysis/scoping_analysis.h"
-#include "codegen/parser.h"
-#include "codegen/entry.h"
-#include "core/cfg.h"
-#include "runtime/objmodel.h"
-#include "runtime/types.h"
-
-using namespace pyston;
-
-
-int main(int argc, char const ** argv) {
-    GLOBAL_VERBOSITY=0;
-    threading::registerMainThread();
-    threading::GLReadRegion _glock;
-    initCodegen();
-
-    if(argc > 2 && argv[1][0] == '-' && argv[1][1] == 'x') {
-        ENABLE_PYPA_PARSER = false;
-    }
-
-    std::string fn = argv[1 + int(argc > 2)];
-
-    try {
-        AST_Module* m = caching_parse(fn.c_str());
-        PrintVisitor* visitor = new PrintVisitor(4);
-        visitor->visit_module(m);
-    } catch (Box* b) {
-        std::string msg = formatException(b);
-        printLastTraceback();
-        fprintf(stderr, "%s\n", msg.c_str());
-
-        return 1;
-    }
-    return 0;
-}

tools/astprint_test.sh

-#! /bin/sh
-
-TOTAL_RESULT=0
-
-pushd `dirname $0` > /dev/null
-SCRIPTPATH=`pwd -P`
-popd > /dev/null
-
-pad=$(printf '%0.1s' " "{1..90})
-TESTSDIR=`realpath $SCRIPTPATH/../test/tests`
-
-mkdir -p results
-for test_script in `find $TESTSDIR -name "*.py"`
-do
-    resultspath="./results/${test_script#$TESTSDIR}"
-    echo $resultspath | grep "encoding" && continue
-    echo $resultspath | grep "codec" && continue
-
-    $SCRIPTPATH/astprint $test_script 2>&1 > /dev/null || (echo $test_script "[SKIPPED]" && continue)
-
-    mkdir -p `dirname $resultspath`
-    touch $resultspath.python $resultspath.pypa
-    $SCRIPTPATH/astprint $test_script > $resultspath.python
-    grep "Warning: converting unicode literal to str" $resultspath.python 2>&1 > /dev/null && rm -f $resultspath.python && continue
-    $SCRIPTPATH/astprint -x $test_script > $resultspath.pypa
-    diff -q $resultspath.python $resultspath.pypa 2>&1 > /dev/null && result=`echo -e "[\033[0;32mSUCCESS\033[0m]"` && rm -f $resultspath.pypa $resultspath.python || result=`echo -e "[\033[0;31mFAILED\033[0m]"` && TOTALRESULT=1
-    reltestscript=$(perl -MFile::Spec -e "print File::Spec->abs2rel(q($test_script),q($SCRIPTPATH))")
-    echo "$reltestscript${pad:${#test_script}} " $result
-done