Merge pull request #12 from ktok07b6/devel

Version 0.3.5

Author: ktok07b6

.flake8

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

polyphony/_internal/__init__.py

@@ -0,0 +1,35 @@
+__version__ = '0.3.5'  # type: str
+
+
+@decorator
+def testbench(func) -> None:
+    pass
+
+
+@decorator
+def pure(func) -> None:
+    pass
+
+
+def is_worker_running() -> bool:
+    pass
+
+
+@decorator
+def module() -> None:
+    pass
+
+
+@decorator
+def rule(kwargs) -> None:
+    pass
+
+
+@builtin
+def unroll(seq, factor='full') -> list:
+    pass
+
+
+@builtin
+def pipelined(seq, ii=-1) -> list:
+    pass

polyphony/_internal/_io.py

@@ -1,9 +1,3 @@
-__all__ = [
-    'Port',
-    'Queue',
-]
-
-
 class Port:
     def __init__(self, dtype:generic, direction:str, init=None, protocol:str='none') -> object:
         pass

polyphony/_internal/_polyphony.py

@@ -1,11 +1,5 @@
-__all__ = [
-    'clksleep',
-    'clkfence',
-    'wait_edge',
-    'wait_rising',
-    'wait_falling',
-    'wait_value',
-]
+from .io import Port
+
 
 @builtin
 def clksleep(clk_cycles:int) -> None:
@@ -18,20 +12,20 @@ def clkfence() -> None:
 
 
 @builtin
-def wait_edge(old:int, new:int, *ports:polyphony.io.Port) -> None:
+def wait_edge(old:int, new:int, *ports:Port) -> None:
     pass
 
 
 @builtin
-def wait_rising(*ports:polyphony.io.Port) -> None:
+def wait_rising(*ports:Port) -> None:
     pass
 
 
 @builtin
-def wait_falling(*ports:polyphony.io.Port) -> None:
+def wait_falling(*ports:Port) -> None:
     pass
 
 
 @builtin
-def wait_value(value:int, *ports:polyphony.io.Port) -> None:
+def wait_value(value:int, *ports:Port) -> None:
     pass

polyphony/_internal/_timing.py

@@ -1,59 +1,3 @@
-__all__ = [
-    'bit',
-    'bit2', 'bit3', 'bit4', 'bit5', 'bit6', 'bit7', 'bit8',
-    'bit9', 'bit10', 'bit11', 'bit12', 'bit13', 'bit14', 'bit15', 'bit16',
-    'bit17', 'bit18', 'bit19', 'bit20', 'bit21', 'bit22', 'bit23', 'bit24',
-    'bit25', 'bit26', 'bit27', 'bit28', 'bit29', 'bit30', 'bit31', 'bit32',
-    'bit33', 'bit34', 'bit35', 'bit36', 'bit37', 'bit38', 'bit39', 'bit40',
-    'bit41', 'bit42', 'bit43', 'bit44', 'bit45', 'bit46', 'bit47', 'bit48',
-    'bit49', 'bit50', 'bit51', 'bit52', 'bit53', 'bit54', 'bit55', 'bit56',
-    'bit57', 'bit58', 'bit59', 'bit60', 'bit61', 'bit62', 'bit63', 'bit64',
-    'bit65', 'bit66', 'bit67', 'bit68', 'bit69', 'bit70', 'bit71', 'bit72',
-    'bit73', 'bit74', 'bit75', 'bit76', 'bit77', 'bit78', 'bit79', 'bit80',
-    'bit81', 'bit82', 'bit83', 'bit84', 'bit85', 'bit86', 'bit87', 'bit88',
-    'bit89', 'bit90', 'bit91', 'bit92', 'bit93', 'bit94', 'bit95', 'bit96',
-    'bit97', 'bit98', 'bit99', 'bit100', 'bit101', 'bit102', 'bit103', 'bit104',
-    'bit105', 'bit106', 'bit107', 'bit108', 'bit109', 'bit110', 'bit111', 'bit112',
-    'bit113', 'bit114', 'bit115', 'bit116', 'bit117', 'bit118', 'bit119', 'bit120',
-    'bit121', 'bit122', 'bit123', 'bit124', 'bit125', 'bit126', 'bit127', 'bit128',
-
-    'int2', 'int3', 'int4', 'int5', 'int6', 'int7', 'int8',
-    'int9', 'int10', 'int11', 'int12', 'int13', 'int14', 'int15', 'int16',
-    'int17', 'int18', 'int19', 'int20', 'int21', 'int22', 'int23', 'int24',
-    'int25', 'int26', 'int27', 'int28', 'int29', 'int30', 'int31', 'int32',
-    'int33', 'int34', 'int35', 'int36', 'int37', 'int38', 'int39', 'int40',
-    'int41', 'int42', 'int43', 'int44', 'int45', 'int46', 'int47', 'int48',
-    'int49', 'int50', 'int51', 'int52', 'int53', 'int54', 'int55', 'int56',
-    'int57', 'int58', 'int59', 'int60', 'int61', 'int62', 'int63', 'int64',
-    'int65', 'int66', 'int67', 'int68', 'int69', 'int70', 'int71', 'int72',
-    'int73', 'int74', 'int75', 'int76', 'int77', 'int78', 'int79', 'int80',
-    'int81', 'int82', 'int83', 'int84', 'int85', 'int86', 'int87', 'int88',
-    'int89', 'int90', 'int91', 'int92', 'int93', 'int94', 'int95', 'int96',
-    'int97', 'int98', 'int99', 'int100', 'int101', 'int102', 'int103', 'int104',
-    'int105', 'int106', 'int107', 'int108', 'int109', 'int110', 'int111', 'int112',
-    'int113', 'int114', 'int115', 'int116', 'int117', 'int118', 'int119', 'int120',
-    'int121', 'int122', 'int123', 'int124', 'int125', 'int126', 'int127', 'int128',
-
-    'uint2', 'uint3', 'uint4', 'uint5', 'uint6', 'uint7', 'uint8',
-    'uint9', 'uint10', 'uint11', 'uint12', 'uint13', 'uint14', 'uint15', 'uint16',
-    'uint17', 'uint18', 'uint19', 'uint20', 'uint21', 'uint22', 'uint23', 'uint24',
-    'uint25', 'uint26', 'uint27', 'uint28', 'uint29', 'uint30', 'uint31', 'uint32',
-    'uint33', 'uint34', 'uint35', 'uint36', 'uint37', 'uint38', 'uint39', 'uint40',
-    'uint41', 'uint42', 'uint43', 'uint44', 'uint45', 'uint46', 'uint47', 'uint48',
-    'uint49', 'uint50', 'uint51', 'uint52', 'uint53', 'uint54', 'uint55', 'uint56',
-    'uint57', 'uint58', 'uint59', 'uint60', 'uint61', 'uint62', 'uint63', 'uint64',
-    'uint65', 'uint66', 'uint67', 'uint68', 'uint69', 'uint70', 'uint71', 'uint72',
-    'uint73', 'uint74', 'uint75', 'uint76', 'uint77', 'uint78', 'uint79', 'uint80',
-    'uint81', 'uint82', 'uint83', 'uint84', 'uint85', 'uint86', 'uint87', 'uint88',
-    'uint89', 'uint90', 'uint91', 'uint92', 'uint93', 'uint94', 'uint95', 'uint96',
-    'uint97', 'uint98', 'uint99', 'uint100', 'uint101', 'uint102', 'uint103', 'uint104',
-    'uint105', 'uint106', 'uint107', 'uint108', 'uint109', 'uint110', 'uint111', 'uint112',
-    'uint113', 'uint114', 'uint115', 'uint116', 'uint117', 'uint118', 'uint119', 'uint120',
-    'uint121', 'uint122', 'uint123', 'uint124', 'uint125', 'uint126', 'uint127', 'uint128',
-    'List',
-    'Tuple',
-]
-
 class bit: pass
 class bit2: pass
 class bit3: pass

polyphony/_internal/_typing.py

@@ -51,7 +51,7 @@
 from .scopegraph import CallGraphBuilder
 from .scopegraph import DependencyGraphBuilder
 from .selectorbuilder import SelectorBuilder
-from .setlineno import LineNumberSetter, SourceDump
+from .setlineno import SourceDump
 from .specfunc import SpecializedFunctionMaker
 from .ssa import ScalarSSATransformer, TupleSSATransformer, ObjectSSATransformer
 from .statereducer import StateReducer
@@ -114,11 +114,8 @@ def is_hdlmodule_scope(scope):
 
 def preprocess_global(driver):
     scopes = Scope.get_scopes(with_global=True, with_class=True)
-    lineno = LineNumberSetter()
     src_dump = SourceDump()
-
     for s in scopes:
-        lineno.process(s)
         src_dump.process(s)
 
 
@@ -369,7 +366,7 @@ def staticconstopt(driver):
     scopes = driver.get_scopes(bottom_up=True,
                                with_global=True,
                                with_class=True,
-                               with_lib=False)
+                               with_lib=True)
     StaticConstOpt().process_scopes(scopes)
 
 
@@ -752,50 +749,32 @@ def setup(src_file, options):
         logging.basicConfig(**logging_setting)
 
     translator = IRTranslator()
-    internal_root_dir = '{0}{1}{2}{1}_internal{1}'.format(
+    root_dir = '{0}{1}{2}{1}'.format(
         os.path.dirname(__file__),
         os.path.sep, os.path.pardir
     )
-    internal_root_dir = os.path.abspath(internal_root_dir) + os.path.sep
-
-    builtin_package_file = internal_root_dir + '_builtins.py'
+    env.root_dir = os.path.abspath(root_dir)
+    internal_dir = f'{env.root_dir}{os.path.sep}_internal'
+    builtin_package_file = f'{internal_dir}{os.sep}_builtins.py'
     env.set_current_filename(builtin_package_file)
     translator.translate(read_source(builtin_package_file), '__builtin__')
 
-    polyphony_package_file = internal_root_dir + '_polyphony.py'
-    env.set_current_filename(polyphony_package_file)
-    translator.translate(read_source(polyphony_package_file), 'polyphony')
-
-    package_names = [
-        'typing',
-        'io',
-        'timing',
-        'verilog'
-    ]
-    for package_name in package_names:
-        package_file = f'{internal_root_dir}_{package_name}.py'
-        env.set_current_filename(package_file)
-        translator.translate(read_source(package_file), package_name)
-
     env.set_current_filename(src_file)
-    g = Scope.create_namespace(None, env.global_scope_name, {'global'})
+    g = Scope.create_namespace(None, env.global_scope_name, {'global'}, src_file)
     env.push_outermost_scope(g)
     for sym in builtin_symbols.values():
         g.import_sym(sym)
 
-    scopes = Scope.get_scopes(with_global=False, with_class=True, with_lib=True)
-    static_lib_scopes = [s for s in scopes
-                         if s.name.startswith('polyphony') and
-                         (s.is_namespace() or s.is_class())]
-    StaticConstOpt().process_scopes(static_lib_scopes)
-
 
 def compile(plan, source, src_file=''):
     translator = IRTranslator()
     translator.translate(source, '')
     if env.config.enable_pure:
         interpret(source, src_file)
-    scopes = Scope.get_scopes(bottom_up=False, with_global=True, with_class=True)
+    scopes = Scope.get_scopes(bottom_up=False,
+                              with_global=True,
+                              with_class=True,
+                              with_lib=True)
     driver = Driver(plan, scopes)
     driver.run()
     return driver.codes