Merge pull request #21 from lerno/master

Updated C3 compiler options to show version, allow check/build/compil…

Author: nordlow

benchmark

@@ -374,8 +374,8 @@ def main():
             benchmark_V(results=results, code_paths=code_paths, args=args, op='Build', templated=True)
 
     if 'C3' in args.languages:
-        if 'Build' in args.operations:
-            benchmark_C3(results=results, code_paths=code_paths, args=args, op='Build', templated=False)
+        for op in args.operations:
+            benchmark_C3(results=results, code_paths=code_paths, args=args, op=op, templated=False)
 
     if 'Zig' in args.languages:
         if 'Check' in args.operations:
@@ -834,12 +834,21 @@ def benchmark_C3(results, code_paths, args, op, templated):
     exe = (match_lang(args, lang, 'c3c') or
            which(os.path.join(HOME, 'ware/c3c/build/c3c')))
     if exe:
-        version = 'unknown'
+        exe_flags = ['-O0']
+
+        if op == 'Check':
+            exe_flags += ['compile-only'] + ['-C']
+        elif op == 'Compile':
+            exe_flags += ['compile-only']
+        else:
+            exe_flags += ['compile']
+
+        version = sp.run([exe, '--version'], stdout=sp.PIPE).stdout.decode('utf-8').split(':')[1].split()[0]
         compile_file(code_paths,
                      out_flag_and_exe=['-o', out_binary(lang)],
                      exe=exe,
                      runner=True,
-                     exe_flags=['compile'],
+                     exe_flags=exe_flags,
                      args=args,
                      op=op,
                      compiler_version=version,
@@ -1299,7 +1308,7 @@ def generate_test_language_specific_postfix(lang, types, f):
     elif lang == 'nim':
         f.write(Tm('\n\n').substitute(T=types[0]))
     elif lang == 'c3':
-        f.write(Tm('\n}\n').substitute(T=types[0]))  # TODO exit
+        f.write(Tm('        return (int)(${T}_sum);\n}\n').substitute(T=types[0]))
     elif lang == 'julia':
         f.write(Tm('''    return ${T}_sum;
 end
@@ -1395,7 +1404,7 @@ def generate_test_function_definition(args, lang, typ, findex, fheight, f,
     if lang in ('c'):
         f.write(Tm('${T} ${F}(${T} x) { return ${X}; }\n').substitute(T=typ, F=str(fname), N=nconst, X=expr))
     elif lang in ('c3'):
-        f.write(Tm('func ${T} ${F}(${T} x) { return ${X}; }\n').substitute(T=typ, F=str(fname), N=nconst, X=expr))
+        f.write(Tm('fn ${T} ${F}(${T} x) { return ${X}; }\n').substitute(T=typ, F=str(fname), N=nconst, X=expr))
     elif lang in ['ada']:
         f.write(Tm('''   function ${F} (x: ${T}) return ${T} is (${X});
 ''').substitute(T=typ, F=str(fname), N=nconst, X=expr))
@@ -1449,13 +1458,13 @@ def generate_test_function_definition(args, lang, typ, findex, fheight, f,
             f.write(Tm('proc ${F}(x: ${T}): ${T} = \n  return ${X}\n').substitute(T=typ, F=str(fname), N=nconst, H=str(fheight), X=expr))
     elif lang == 'c3':
         if templated:
-            f.write(Tm('func ${F}<${T}>(x: ${T}) -> ${T} { return ${X} }\n').substitute(T='T',
+            f.write(Tm('fn ${F}<${T}>(x: ${T}) -> ${T} { return ${X} }\n').substitute(T='T',
                                                                                         F=str(fname),
                                                                                         N=nconst,
                                                                                         H=str(fheight),
                                                                                         X=expr))
         else:
-            f.write(Tm('func ${T} ${F}(${T} x) { return ${X} }\n').substitute(T=typ, F=str(fname), N=nconst, H=str(fheight), X=expr))
+            f.write(Tm('fn ${T} ${F}(${T} x) { return ${X} }\n').substitute(T=typ, F=str(fname), N=nconst, H=str(fheight), X=expr))
     elif lang == 'zig':
         if templated:
             f.write(Tm('fn ${F}(comptime T: type, x: T) T { return ${X}; }\n').substitute(T=typ, F=str(fname), N=nconst, H=str(fheight), X=expr))
@@ -1497,7 +1506,7 @@ def generate_test_main_header(lang, types, f, templated):
     elif lang == 'zig':
         f.write(Tm('pub fn main() void {\n').substitute(T=types[0]))
     elif lang == 'c3':
-        f.write(Tm('func void main() {\n').substitute(T=types[0]))
+        f.write(Tm('fn int main() {\n').substitute(T=types[0]))
     elif lang == 'go':
         f.write(Tm('func main() {\n').substitute(T=types[0]))
     elif lang == 'v':
@@ -1596,11 +1605,14 @@ def generate_test_program_2(function_count, lang, templated):
 
         for typ in types:
             for findex in range(0, function_count):
-                if lang in ('c', 'c3', 'c++'):
+                if lang in ('c', 'c++'):
                     f.write(Tm('''${T} add_${T}_n${N}(${T} x) { return x + ${N}; }
 ''').substitute(T=typ, N=str(findex)))
                 if lang in ('d', 'vox'):
                     f.write(Tm('''${T} add_${T}_n${N}(${T} x) pure { return x + ${N}; }
+''').substitute(T=typ, N=str(findex)))
+                elif lang == 'c3':
+                    f.write(Tm('''fn ${T} add_${T}_n${N}(${T} x) { return x + ${N}; }
 ''').substitute(T=typ, N=str(findex)))
                 elif lang == 'rust':
                     f.write(Tm('''fn add_${T}_n${N}(x: ${T}) -> ${T} { x + ${N} }