Merge branch 'develop'

Author: thejoeejoee

ifj2017/interpreter/instruction.py

@@ -140,12 +140,17 @@ def operands(self):
         'READ': State.read,
         'TYPE': lambda state, op0, op1: state.set_value(
             op0,
-            Operand.CONSTANT_MAPPING_REVERSE.get(type(state.get_value(op1))) if state.get_value(op1) is not None else ''
+            type(state.get_value(op1)).__name__
+            if state.get_value(op1) is not None else ''
         ),
 
         'BREAK': lambda state: state.stderr.write('{}\n'.format(state)),
         'DPRINT': lambda state, op0: state.stderr.write('{}\n'.format(state.get_value(op0))),
-        'GROOT': lambda state: state.stderr.write('Price: {} ({}+{}).\n'.format(state.price, state.instruction_price, state.operand_price)),
+        'GROOT': lambda state: state.stderr.write(
+            'Price: {} ({}+{}).\n'.format(
+                state.price, state.instruction_price, state.operand_price
+            )
+        ),
 
         'CONCAT': lambda state, target, op0, op1: state.set_value(target, ''.join((
             state.get_value(op0),

utils/release.py

@@ -7,13 +7,15 @@
 from glob import glob1
 from operator import itemgetter
 from os import unlink, getcwd
-from os.path import basename, join, abspath
+from os.path import basename, join, abspath, dirname
 from tarfile import TarFile
 from tempfile import mktemp
 
 from git import Repo
 
-__DIR__ = abspath(getcwd())
+__CWD_DIR__ = abspath(getcwd())
+__DIR__ = dirname(abspath(__file__))
+__PROJECT_DIR__ = abspath(join(dirname(abspath(__file__)), '..'))
 
 HEADER = """\
 /*
@@ -23,6 +25,7 @@
  * @author {} 
  * 
  * Generated: {}
+ * Academic year: 2017-2018
  * Team: xkobel02, xkolar71, xpazdi02, xnguye16
  * Project URL: https://github.com/thejoeejoee/IFJ-VUT-BIT-2017-2018
  * Encoding: UTF-8
@@ -49,8 +52,17 @@ def _add_header(original, target_file, authors):
         )
 
 
-def deploy(source_dir, to_archive):
-    source_dir = abspath(join(__DIR__, source_dir))
+def include_tests(archive: TarFile):
+    def exclude(name: str):
+        return name.endswith('pyc') or '__pycache__' in name
+
+    archive.add(join(__PROJECT_DIR__, 'test.py'), 'tests/test.py')
+    for d in 'benchmark interpreter test tests __init__.py'.split():
+        archive.add(join(__PROJECT_DIR__, 'ifj2017/{}'.format(d)), 'tests/ifj2017/{}'.format(d), exclude=exclude)
+
+
+def deploy(source_dir, to_archive, tests=False):
+    source_dir = abspath(join(__CWD_DIR__, source_dir))
     source_files = set(glob1(source_dir, '*.c') + glob1(source_dir, '*.h') + glob1(source_dir, 'Makefile'))
     source_files.add(join(source_dir, '../rozdeleni'))
     source_files.add(join(source_dir, '../rozsireni'))
@@ -64,7 +76,6 @@ def deploy(source_dir, to_archive):
     repository = Repo(source_dir, search_parent_directories=True)
 
     with TarFile.open(name=to_archive, mode='x:gz') as target_archive:
-
         for file_ in source_files:
             print('Processing {}.'.format(file_), file=sys.stderr)
             counter = Counter(
@@ -86,6 +97,8 @@ def deploy(source_dir, to_archive):
                 map(itemgetter(0), counter.most_common())
             )
             target_archive.add(modified, arcname=basename(file_))
+        if tests:
+            include_tests(target_archive)
 
 
 def main():
@@ -95,9 +108,10 @@ def main():
 
     parser.add_argument("source_dir", help="path to src of project")
     parser.add_argument("archive_name", help="name of produced")
+    parser.add_argument("--tests", help="include tests?", action='store_true')
 
     args = parser.parse_args()
-    return deploy(args.source_dir, args.archive_name)
+    return deploy(args.source_dir, args.archive_name, args.tests)
 
 
 if __name__ == '__main__':