164 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lane Roathe	ad163f5579	Merge pull request #14 from lroathe/master ... Mege in latest from sql branch	2019-11-17 20:26:15 -08:00
Lane Roathe	79c0cbf7ce	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-17 20:25:05 -08:00
marketideas	09482611cf	test	2019-11-17 19:54:48 -08:00
marketideas	3286572aa7	test	2019-11-17 19:05:50 -08:00
marketideas	065a247cc2	test	2019-11-17 18:46:49 -08:00
marketideas	27b76264b6	test	2019-11-17 18:18:50 -08:00
marketideas	f83906fe16	test	2019-11-17 18:16:39 -08:00
marketideas	f2addba16b	test	2019-11-17 18:09:44 -08:00
Lane Roathe	ed6867cc3d	Merge pull request #13 from lroathe/master ... Merge from sql branch	2019-11-17 17:47:27 -08:00
Lane Roathe	371317ba18	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-17 17:46:27 -08:00
Lane Roathe	c4096ee19d	Merge pull request #12 from lroathe/master ... ASC psuedo opcode is working	2019-11-17 17:45:09 -08:00
Lane Roathe	b56c09dc58	ASC psuedo opcode is working	2019-11-17 17:41:42 -08:00
marketideas	f8c793ead2	more work on runtests	2019-11-17 17:01:59 -08:00
Lane Roathe	60bc85a823	Merge pull request #11 from lroathe/master ... HEX fix, start of ASC work	2019-11-17 16:16:45 -08:00
marketideas	7733b41076	test	2019-11-17 16:14:52 -08:00
Lane Roathe	1a7193c4d5	Fix HEX opcode (line.operand_expr to line.operand) and move hex char eval code to a routine in anticipation of using for ASC parsing	2019-11-17 16:14:01 -08:00
Lane Roathe	8ae6f0ba3c	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-17 15:04:20 -08:00
marketideas	f639c41946	test updates	2019-11-17 14:26:06 -08:00
marketideas	0bea0d2254	working on testdata tests	2019-11-17 14:15:45 -08:00
marketideas	dcd12630af	test	2019-11-17 13:32:32 -08:00
marketideas	988e4b1f62	test	2019-11-17 12:17:28 -08:00
Lane Roathe	c4df28c63a	Merge pull request #10 from lroathe/master ... Silence warning about 64 to 32 bit conversion	2019-11-17 11:42:58 -08:00
Lane Roathe	828675483a	Silence warning about 64 to 32 bit conversion	2019-11-17 11:42:16 -08:00
Lane Roathe	f7f877af71	Merge pull request #9 from lroathe/master ... Testing merge from my fork to my local branch	2019-11-17 11:24:12 -08:00
Lane Roathe	1cfe6ebbbf	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-17 11:19:42 -08:00
Lane Roathe	df8c9ef7d3	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-17 11:18:23 -08:00
marketideas	18c6987d34	test	2019-11-17 08:02:55 -08:00
marketideas	9009f5a222	test	2019-11-16 22:48:24 -08:00
marketideas	5e2fdd7b78	debug and release builds in Makefile	2019-11-16 21:18:52 -08:00
marketideas	671e8ac4da	Merge pull request #8 from marketideas/sgq_qasm_main ... Sgq qasm main	2019-11-16 21:08:09 -08:00
marketideas	3b92d28f18	fixed formatter	2019-11-16 21:06:29 -08:00
marketideas	046335d9db	fixed formatter	2019-11-16 21:03:19 -08:00
marketideas	b1eeb0a648	DUP/IF/OPCODES/LST	2019-11-16 20:48:25 -08:00
marketideas	140121f13e	opcodes working again	2019-11-16 20:39:09 -08:00
marketideas	6664a3e103	if/else/fin and some lst work	2019-11-16 19:33:22 -08:00
marketideas	02bdd29e79	test	2019-11-16 18:27:19 -08:00
marketideas	96ae01d615	test	2019-11-16 17:36:22 -08:00
marketideas	a6d239f87a	test	2019-11-16 11:14:51 -08:00
marketideas	022eaa0438	test	2019-11-16 10:48:01 -08:00
marketideas	568c09b91e	test	2019-11-16 09:27:24 -08:00
marketideas	fe34518911	test	2019-11-15 22:27:43 -08:00
marketideas	a8030744bc	test	2019-11-15 18:51:30 -08:00
marketideas	5c3dddd948	test	2019-11-15 18:40:12 -08:00
marketideas	6df441dd46	SGQ merge	2019-11-15 18:39:05 -08:00
marketideas	367be31104	test	2019-11-15 18:30:12 -08:00
Lane Roathe	b208c4bd41	Merge pull request #6 from lroathe/master ... Bring my branch up to date	2019-11-15 18:10:11 -08:00
Lane Roathe	429131b738	Upgrade Xcode project	2019-11-15 18:08:42 -08:00
Lane Roathe	05216d2058	Upgrade Xcode project	2019-11-15 18:08:29 -08:00
Lane Roathe	ac3517fc69	Support UNUSED and put inttypes.h into system search pattern	2019-11-15 18:08:15 -08:00
Lane Roathe	8e4d6986fc	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-15 17:59:27 -08:00