API tools faq
paste
Advertisement
Zelatrix

tmp_paste

Zelatrix
Sep 7th, 2022
133
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.48 KB | None | 0 0
raw download clone embed print report
  1. On branch functions-complete
  2. Your branch and 'origin/functions-complete' have diverged,
  3. and have 1 and 33 different commits each, respectively.
  4. (use "git pull" to merge the remote branch into yours)
  5.  
  6. You have unmerged paths.
  7. (fix conflicts and run "git commit")
  8. (use "git merge --abort" to abort the merge)
  9.  
  10. Changes to be committed:
  11. modified: DOCS.md
  12. modified: README.md
  13. new file: "__pycache__/ast.cpython-37.pyc\357\200\272Zone.Identifier"
  14. new file: "__pycache__/codegen.cpython-37.pyc\357\200\272Zone.Identifier"
  15. new file: "__pycache__/codegen.cpython-38.pyc\357\200\272Zone.Identifier"
  16. new file: "__pycache__/lexer.cpython-37.pyc\357\200\272Zone.Identifier"
  17. new file: "__pycache__/lexer.cpython-38.pyc\357\200\272Zone.Identifier"
  18. new file: "__pycache__/my_ast.cpython-310.pyc\357\200\272Zone.Identifier"
  19. new file: "__pycache__/my_ast.cpython-38.pyc\357\200\272Zone.Identifier"
  20. new file: "__pycache__/my_parser.cpython-37.pyc\357\200\272Zone.Identifier"
  21. new file: "__pycache__/my_parser.cpython-38.pyc\357\200\272Zone.Identifier"
  22. new file: "compiled_tests/ZIDs/a.out\357\200\272Zone.Identifier"
  23. new file: "compiled_tests/ZIDs/addition.ll\357\200\272Zone.Identifier"
  24. new file: "compiled_tests/ZIDs/arrays.ll\357\200\272Zone.Identifier"
  25. new file: "compiled_tests/ZIDs/factorial.ll\357\200\272Zone.Identifier"
  26. new file: "compiled_tests/ZIDs/fizzbuzz.ll\357\200\272Zone.Identifier"
  27. new file: "compiled_tests/ZIDs/fun_test.ll\357\200\272Zone.Identifier"
  28. new file: "compiled_tests/ZIDs/fun_test_2.ll\357\200\272Zone.Identifier"
  29. new file: "compiled_tests/ZIDs/func_arg.ll\357\200\272Zone.Identifier"
  30. new file: "compiled_tests/ZIDs/hello_world.ll\357\200\272Zone.Identifier"
  31. new file: "compiled_tests/ZIDs/increment_by_var.ll\357\200\272Zone.Identifier"
  32. new file: "compiled_tests/ZIDs/infinite_loop.ll\357\200\272Zone.Identifier"
  33. new file: "compiled_tests/ZIDs/modulus.ll\357\200\272Zone.Identifier"
  34. new file: "compiled_tests/ZIDs/power_two.ll\357\200\272Zone.Identifier"
  35. new file: "compiled_tests/ZIDs/print.ll\357\200\272Zone.Identifier"
  36. new file: "compiled_tests/ZIDs/short_increment.ll\357\200\272Zone.Identifier"
  37. new file: "compiled_tests/ZIDs/str_test.ll\357\200\272Zone.Identifier"
  38. new file: "compiled_tests/ZIDs/subtraction.ll\357\200\272Zone.Identifier"
  39. new file: "compiled_tests/ZIDs/temp.ll\357\200\272Zone.Identifier"
  40. new file: "compiled_tests/ZIDs/test.ll\357\200\272Zone.Identifier"
  41. new file: "compiled_tests/ZIDs/test_ir.ll\357\200\272Zone.Identifier"
  42. new file: "compiled_tests/ZIDs/times_var.ll\357\200\272Zone.Identifier"
  43. new file: "compiled_tests/ZIDs/truth_machine.ll\357\200\272Zone.Identifier"
  44. new file: "compiled_tests/ZIDs/typedef.ll\357\200\272Zone.Identifier"
  45. new file: "compiled_tests/ZIDs/var_arith.ll\357\200\272Zone.Identifier"
  46. new file: "compiled_tests/ZIDs/var_expr.ll\357\200\272Zone.Identifier"
  47. new file: "compiled_tests/ZIDs/var_test.ll\357\200\272Zone.Identifier"
  48. new file: "compiled_tests/ZIDs/var_var.ll\357\200\272Zone.Identifier"
  49. new file: "compiled_tests/ZIDs/while_loop.ll\357\200\272Zone.Identifier"
  50. new file: "compiled_tests/loops/while.ll\357\200\272Zone.Identifier"
  51. new file: "compiled_tests/loops/while_correct.ll\357\200\272Zone.Identifier"
  52. new file: "compiled_tests/loops/while_ir.ll\357\200\272Zone.Identifier"
  53. new file: "compiled_tests/loops/while_loop.ll\357\200\272Zone.Identifier"
  54. new file: golf_files/here
  55. new file: "golf_files/program_features/arithmetic/addition.golf\357\200\272Zone.Identifier"
  56. new file: "golf_files/program_features/arithmetic/decrement_test.golf\357\200\272Zone.Identifier"
  57. new file: "golf_files/program_features/arithmetic/fdiv_test.golf\357\200\272Zone.Identifier"
  58. new file: "golf_files/program_features/arithmetic/fpadd.golf\357\200\272Zone.Identifier"
  59. new file: "golf_files/program_features/arithmetic/increment.golf\357\200\272Zone.Identifier"
  60. new file: "golf_files/program_features/arithmetic/long_increment.golf\357\200\272Zone.Identifier"
  61. new file: "golf_files/program_features/arithmetic/modulus.golf\357\200\272Zone.Identifier"
  62. new file: "golf_files/program_features/arithmetic/multiply.golf\357\200\272Zone.Identifier"
  63. new file: "golf_files/program_features/arithmetic/negative_num.golf\357\200\272Zone.Identifier"
  64. new file: "golf_files/program_features/arithmetic/normal_divide.golf\357\200\272Zone.Identifier"
  65. new file: "golf_files/program_features/arithmetic/num_type.golf\357\200\272Zone.Identifier"
  66. new file: "golf_files/program_features/arithmetic/precedence_test.golf\357\200\272Zone.Identifier"
  67. new file: "golf_files/program_features/arithmetic/subtraction.golf\357\200\272Zone.Identifier"
  68. new file: "golf_files/program_features/arithmetic/zero_divide.golf\357\200\272Zone.Identifier"
  69. new file: "golf_files/program_features/booleans/bool_test.golf\357\200\272Zone.Identifier"
  70. new file: "golf_files/program_features/booleans/comparison_test.golf\357\200\272Zone.Identifier"
  71. new file: "golf_files/program_features/booleans/equal_test.golf\357\200\272Zone.Identifier"
  72. new file: "golf_files/program_features/booleans/greater_equal.golf\357\200\272Zone.Identifier"
  73. new file: "golf_files/program_features/booleans/greater_than.golf\357\200\272Zone.Identifier"
  74. new file: "golf_files/program_features/booleans/less_equal.golf\357\200\272Zone.Identifier"
  75. new file: "golf_files/program_features/booleans/less_than.golf\357\200\272Zone.Identifier"
  76. new file: "golf_files/program_features/booleans/not_equal_test.golf\357\200\272Zone.Identifier"
  77. new file: "golf_files/program_features/comment_test.golf\357\200\272Zone.Identifier"
  78. new file: "golf_files/program_features/control_flow/if_else.golf\357\200\272Zone.Identifier"
  79. new file: "golf_files/program_features/control_flow/if_then.golf\357\200\272Zone.Identifier"
  80. new file: "golf_files/program_features/control_flow/while_loop.golf\357\200\272Zone.Identifier"
  81. new file: "golf_files/program_features/fun_test.golf\357\200\272Zone.Identifier"
  82. new file: "golf_files/program_features/fun_test_2.golf\357\200\272Zone.Identifier"
  83. new file: "golf_files/program_features/long_str_test.golf\357\200\272Zone.Identifier"
  84. new file: "golf_files/program_features/multiple_statements.golf\357\200\272Zone.Identifier"
  85. new file: "golf_files/program_features/parse_test.golf\357\200\272Zone.Identifier"
  86. new file: "golf_files/program_features/return_test.golf\357\200\272Zone.Identifier"
  87. new file: "golf_files/program_features/str_test.golf\357\200\272Zone.Identifier"
  88. new file: "golf_files/program_features/variables/increment_by_var.golf\357\200\272Zone.Identifier"
  89. new file: "golf_files/program_features/variables/reassign.golf\357\200\272Zone.Identifier"
  90. new file: "golf_files/program_features/variables/var_eq.golf\357\200\272Zone.Identifier"
  91. new file: "golf_files/program_features/variables/var_expr.golf\357\200\272Zone.Identifier"
  92. new file: "golf_files/program_features/variables/var_test.golf\357\200\272Zone.Identifier"
  93. new file: "html_docs/DOCS.html\357\200\272Zone.Identifier"
  94. new file: "html_docs/README.html\357\200\272Zone.Identifier"
  95. new file: "html_docs/corpus.html\357\200\272Zone.Identifier"
  96. new file: "images/golf_pl_logo.png\357\200\272Zone.Identifier"
  97. new file: "unit_tests/__init__.py\357\200\272Zone.Identifier"
  98. new file: "unit_tests/__pycache__/__init__.cpython-39.pyc\357\200\272Zone.Identifier"
  99. new file: "unit_tests/__pycache__/arithmetic_test.cpython-39.pyc\357\200\272Zone.Identifier"
  100. new file: "unit_tests/__pycache__/comparison_test.cpython-39.pyc\357\200\272Zone.Identifier"
  101. new file: "unit_tests/__pycache__/conditional_test.cpython-39.pyc\357\200\272Zone.Identifier"
  102. new file: "unit_tests/arithmetic_test.py\357\200\272Zone.Identifier"
  103. new file: "unit_tests/comparison_test.py\357\200\272Zone.Identifier"
  104. new file: "unit_tests/conditional_test.py\357\200\272Zone.Identifier"
  105.  
  106. Unmerged paths:
  107. (use "git add/rm <file>..." as appropriate to mark resolution)
  108. deleted by them: ll_files/godbolt.ll
  109. deleted by them: ll_files/test.ll
  110. deleted by them: ll_files/test2.ll
  111. deleted by them: ll_files/test_fn.ll
  112. deleted by them: ll_files/test_fn2.ll
  113. deleted by them: tmp_dir/golf_files/program_features/arithmetic/modulus.golf
  114.  
  115. Untracked files:
  116. (use "git add <file>..." to include in what will be committed)
  117. compiled_tests/bool_test.ll
  118. compiled_tests/loop_break.ll
  119. compiled_tests/multiple_funs.ll
  120. compiled_tests/recursion.ll
  121. compiled_tests/test_sub.ll
  122. diff_test.py
  123. features.txt
  124. golf_files/bool_test.golf
  125. golf_files/loop_break.golf
  126. golf_files/multiple_funs.golf
  127. golf_files/new_keywords.golf
  128. golf_files/test_sub.golf
  129. test_func.py
  130. tmp_dir.zip
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!