From 172b731224a44da7edd4d3cba9b5c73a7a42278b Mon Sep 17 00:00:00 2001
From: Larry Xue <larry.p.xue@gmail.com>
Date: Sat, 22 Aug 2020 23:28:27 -0400
Subject: [PATCH] made more user friendly

---
 README.md                            |  11 +++++++++++
 a.out                                | Bin 16320 -> 0 bytes
 c2logic/compiler.py                  |  11 ++++++-----
 examples/{test2.c => control_flow.c} |   0
 examples/{test.c => funcs.c}         |   0
 setup.py                             |   4 ++--
 6 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 README.md
 delete mode 100755 a.out
 rename examples/{test2.c => control_flow.c} (100%)
 rename examples/{test.c => funcs.c} (100%)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..880684d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+# c2logic
+
+Compiles C code to Mindustry logic.
+
+# Usage
+
+`python3 -m c2logic filename -O optimization_level`
+
+where `filename` is a string and `optimization_level` is an int
+
+See [examples](./examples) for API sample usage.
diff --git a/a.out b/a.out
deleted file mode 100755
index 4f2f6cb6fb9c57cc4bd416d2d0ab707f47f289d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16320
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
RU&0#?pnp58cJ{dw{{f7g=AZxo

diff --git a/c2logic/compiler.py b/c2logic/compiler.py
index 3c1ad0b..360c302 100644
--- a/c2logic/compiler.py
+++ b/c2logic/compiler.py
@@ -41,7 +41,6 @@ class Compiler(c_ast.NodeVisitor):
 		self.loop_start = None
 		self.cond_jump_offset = None
 		ast = parse_file(filename, use_cpp=True, cpp_args=["-I", "include/"])
-		print(ast)
 		self.visit(ast)
 		#TODO actually handle functions properly
 		out = []
@@ -93,8 +92,6 @@ class Compiler(c_ast.NodeVisitor):
 		#in case for loop is the last thing in a function to ensure the jump target is valid
 		#TODO avoid this when for loop isn't last thing
 		self.push(Noop())
-		
-		print(self.curr_function)
 		self.functions.append(self.curr_function)
 	
 	def visit_Decl(self, node):
@@ -160,7 +157,6 @@ class Compiler(c_ast.NodeVisitor):
 		self.loop_start = len(self.curr_function.instructions)
 		self.visit(node.cond)
 		# jump over loop body when cond is false
-		print(self.peek())
 		if isinstance(self.peek(), BinaryOp):
 			self.push(RelativeJump(None, JumpCondition.from_binaryop(self.pop())))
 		else:
@@ -302,7 +298,12 @@ class Compiler(c_ast.NodeVisitor):
 			raise NotImplementedError(node)
 
 def main():
-	print(Compiler(opt_level=1).compile("examples/test.c"))
+	import argparse
+	parser = argparse.ArgumentParser()
+	parser.add_argument("file")
+	parser.add_argument("-O", "--optimization-level", type=int, default=1)
+	args = parser.parse_args()
+	print(Compiler(args.optimization_level).compile(args.file))
 
 if __name__ == "__main__":
 	main()
\ No newline at end of file
diff --git a/examples/test2.c b/examples/control_flow.c
similarity index 100%
rename from examples/test2.c
rename to examples/control_flow.c
diff --git a/examples/test.c b/examples/funcs.c
similarity index 100%
rename from examples/test.c
rename to examples/funcs.c
diff --git a/setup.py b/setup.py
index 0c1b1fc..8bd3318 100755
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,10 @@ with open("README.md", "r") as f:
 setuptools.setup(
 	name="c2logic",
 	version="0.1",
-	descripton="Compile c to mindustry logic.",
+	descripton="Compiles C code to mindustry logic.",
 	long_description=long_description,
 	long_description_content_type="text/markdown",
-	packages=["c2logic"], 
+	packages=["c2logic"],
 	license="MIT",
 	author="SuperStormer",
 	url="https://github.com/SuperStormer/c2logic",