Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- On branch functions-complete
- Your branch and 'origin/functions-complete' have diverged,
- and have 1 and 33 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- You have unmerged paths.
- (fix conflicts and run "git commit")
- (use "git merge --abort" to abort the merge)
- Changes to be committed:
- modified: DOCS.md
- modified: README.md
- new file: "__pycache__/ast.cpython-37.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/codegen.cpython-37.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/codegen.cpython-38.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/lexer.cpython-37.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/lexer.cpython-38.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/my_ast.cpython-310.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/my_ast.cpython-38.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/my_parser.cpython-37.pyc\357\200\272Zone.Identifier"
- new file: "__pycache__/my_parser.cpython-38.pyc\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/a.out\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/addition.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/arrays.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/factorial.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/fizzbuzz.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/fun_test.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/fun_test_2.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/func_arg.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/hello_world.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/increment_by_var.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/infinite_loop.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/modulus.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/power_two.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/print.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/short_increment.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/str_test.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/subtraction.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/temp.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/test.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/test_ir.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/times_var.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/truth_machine.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/typedef.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/var_arith.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/var_expr.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/var_test.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/var_var.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/ZIDs/while_loop.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/loops/while.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/loops/while_correct.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/loops/while_ir.ll\357\200\272Zone.Identifier"
- new file: "compiled_tests/loops/while_loop.ll\357\200\272Zone.Identifier"
- new file: golf_files/here
- new file: "golf_files/program_features/arithmetic/addition.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/decrement_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/fdiv_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/fpadd.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/increment.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/long_increment.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/modulus.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/multiply.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/negative_num.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/normal_divide.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/num_type.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/precedence_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/subtraction.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/arithmetic/zero_divide.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/bool_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/comparison_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/equal_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/greater_equal.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/greater_than.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/less_equal.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/less_than.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/booleans/not_equal_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/comment_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/control_flow/if_else.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/control_flow/if_then.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/control_flow/while_loop.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/fun_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/fun_test_2.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/long_str_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/multiple_statements.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/parse_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/return_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/str_test.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/variables/increment_by_var.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/variables/reassign.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/variables/var_eq.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/variables/var_expr.golf\357\200\272Zone.Identifier"
- new file: "golf_files/program_features/variables/var_test.golf\357\200\272Zone.Identifier"
- new file: "html_docs/DOCS.html\357\200\272Zone.Identifier"
- new file: "html_docs/README.html\357\200\272Zone.Identifier"
- new file: "html_docs/corpus.html\357\200\272Zone.Identifier"
- new file: "images/golf_pl_logo.png\357\200\272Zone.Identifier"
- new file: "unit_tests/__init__.py\357\200\272Zone.Identifier"
- new file: "unit_tests/__pycache__/__init__.cpython-39.pyc\357\200\272Zone.Identifier"
- new file: "unit_tests/__pycache__/arithmetic_test.cpython-39.pyc\357\200\272Zone.Identifier"
- new file: "unit_tests/__pycache__/comparison_test.cpython-39.pyc\357\200\272Zone.Identifier"
- new file: "unit_tests/__pycache__/conditional_test.cpython-39.pyc\357\200\272Zone.Identifier"
- new file: "unit_tests/arithmetic_test.py\357\200\272Zone.Identifier"
- new file: "unit_tests/comparison_test.py\357\200\272Zone.Identifier"
- new file: "unit_tests/conditional_test.py\357\200\272Zone.Identifier"
- Unmerged paths:
- (use "git add/rm <file>..." as appropriate to mark resolution)
- deleted by them: ll_files/godbolt.ll
- deleted by them: ll_files/test.ll
- deleted by them: ll_files/test2.ll
- deleted by them: ll_files/test_fn.ll
- deleted by them: ll_files/test_fn2.ll
- deleted by them: tmp_dir/golf_files/program_features/arithmetic/modulus.golf
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- compiled_tests/bool_test.ll
- compiled_tests/loop_break.ll
- compiled_tests/multiple_funs.ll
- compiled_tests/recursion.ll
- compiled_tests/test_sub.ll
- diff_test.py
- features.txt
- golf_files/bool_test.golf
- golf_files/loop_break.golf
- golf_files/multiple_funs.golf
- golf_files/new_keywords.golf
- golf_files/test_sub.golf
- test_func.py
- tmp_dir.zip
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement