Merge pull request #17 from polyphony-dev/devel

version 0.4.0

Author: ktok07b6

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 ignore = H101,H301,H304,H306,E221,E231,E241,E265,F403,F405,W503,W504
-max-line-length = 99
+max-line-length = 120

.gitignore

@@ -1,6 +1,7 @@
 .gitignore
+.*/
+.*
 __pycache__
 debug*
-tmp/
 out/
 .suite_ignores

.suite_ignores

@@ -0,0 +1,10 @@
+io/connect01.py
+io/connect02.py
+io/connect03.py
+io/connect04.py
+io/flipped01.py
+io/flipped02.py
+io/flipped03.py
+io/flipped04.py
+io/thru01.py
+io/thru02.py

error.py

@@ -14,7 +14,7 @@
 sys.path.append(ROOT_DIR)
 
 from polyphony.compiler.__main__ import compile_main, logging_setting
-from polyphony.compiler.env import env
+from polyphony.compiler.common.env import env
 
 
 def parse_options():
@@ -26,13 +26,20 @@ def parse_options():
     parser.add_argument('-d', '--enable_debug', dest='debug_mode',
                         action='store_true', help='enable debug mode')
     parser.add_argument('-w', dest='warn_test', action='store_true')
+    parser.add_argument('-p', dest='with_path_name', action='store_true')
     parser.add_argument('source', help='Python source file')
     return parser.parse_args()
 
 
-def make_compile_options(casename, err_options, quiet_level):
+def make_compile_options(casename, casefile_path, err_options, quiet_level):
     options = types.SimpleNamespace()
     options.config = err_options.config
+    if err_options.with_path_name:
+        p, _ = os.path.splitext(casefile_path)
+        options.output_prefix = p.replace('.', '').replace(os.path.sep, '_')
+        casename = f'{options.output_prefix}_{casename}'
+    else:
+        options.output_prefix = ''
     options.output_name = casename
     options.output_dir = TMP_DIR
     options.verbose_level = 0
@@ -52,7 +59,7 @@ def error_test(casefile_path, err_options):
             print('The file is not error test file')
             sys.exit(0)
         expected_msg = first_line.split('#')[1].rstrip('\n')
-    options = make_compile_options(casename, err_options, env.QUIET_ERROR)
+    options = make_compile_options(casename, casefile_path, err_options, env.QUIET_ERROR)
     try:
         compile_main(casefile_path, options)
     except AssertionError:
@@ -81,13 +88,17 @@ def warn_test(casefile_path, err_options):
         expected_msg = first_line.split('#')[1].rstrip('\n')
     f = io.StringIO()
     err_options.debug_mode = False
-    options = make_compile_options(casename, err_options, 0)
+    options = make_compile_options(casename, casefile_path, err_options, 0)
+    stopped = False
     with redirect_stdout(f):
         try:
             compile_main(casefile_path, options)
         except Exception as e:
-            print(casefile_path)
-            print('[WARNING TEST] FAILED')
+            stopped = True
+    if stopped:
+        print(casefile_path)
+        print('[WARNING TEST] FAILED: Compilation has stopped')
+        return False
     msg = f.getvalue()
     #print(msg)
     header = 'Warning: '