252 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
marketideas	279de5caa5	macro on last line bug fixed, nested macro defs	2019-11-21 21:00:26 -08:00
marketideas	b154efff36	fixes for nested DO/IF/ELSE/FIN	2019-11-21 19:20:59 -08:00
marketideas	133f885424	Merge pull request #22 from marketideas/sgq_qasm_main ... macros with vars	2019-11-21 18:16:19 -08:00
marketideas	d86bd06e8e	macros with vars now working	2019-11-21 18:14:30 -08:00
marketideas	21da3e7536	more macros and vars	2019-11-21 08:47:03 -08:00
marketideas	41fcc6451b	Merge pull request #21 from marketideas/sgq_qasm_main ... Sgq qasm main	2019-11-21 04:54:26 -08:00
marketideas	c9febb19bd	macros are defining/expanding - no ]vars	2019-11-21 04:53:10 -08:00
marketideas	e2203ca1d3	start of macro code	2019-11-20 21:50:00 -08:00
marketideas	0b8a9dfae4	more m32 compatibility tests	2019-11-20 18:36:29 -08:00
Lane Roathe	3cab17d7f5	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-20 13:42:08 -08:00
marketideas	d65b01a882	more mods for testruns	2019-11-20 10:39:28 -08:00
marketideas	37ba8aaf40	more mods for testruns	2019-11-20 10:38:23 -08:00
marketideas	eba951f00f	moving some test scripts around	2019-11-20 10:20:43 -08:00
marketideas	630ea66623	adding script to create M32 output files	2019-11-20 07:59:02 -08:00
Lane Roathe	810db2f286	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-19 17:21:22 -08:00
marketideas	e2dd7ab645	test	2019-11-19 17:09:58 -08:00
marketideas	d3bc1455fa	removed operand with spaces	2019-11-19 15:55:38 -08:00
marketideas	661de97c2c	Merge pull request #20 from marketideas/sgq_qasm_main ... Sgq qasm main	2019-11-19 13:45:40 -08:00
marketideas	4781b693aa	update README	2019-11-19 13:45:12 -08:00
marketideas	2ebeb0914c	work on <>|^ operators to match M32	2019-11-19 13:41:27 -08:00
marketideas	d30965d72d	Merge pull request #19 from marketideas/sgq_qasm_main ... Sgq qasm main	2019-11-19 12:08:31 -08:00
marketideas	7534c45def	]var EQU does an eval first and updates the variable to the resulting hex value	2019-11-19 12:06:08 -08:00
marketideas	2e6f8af54e	all tests assemble, ]vars seem to be working	2019-11-19 11:27:17 -08:00
marketideas	4fa1c51549	added --syntax option	2019-11-19 09:59:03 -08:00
marketideas	572bdd5879	just a few more parser fixes	2019-11-19 09:22:27 -08:00
marketideas	3ad9f76075	Merge pull request #18 from marketideas/sgq_qasm_main ... Sgq qasm main	2019-11-19 08:40:45 -08:00
marketideas	b391c9b729	parser regex complete	2019-11-19 08:38:49 -08:00
marketideas	dd7dcb4082	use regEx in parser to better handle strings	2019-11-18 22:29:06 -08:00
Lane Roathe	e4548bf453	Merge pull request #17 from lroathe/master ... Fix DCI handling	2019-11-18 12:46:38 -08:00
Lane Roathe	ae6f8244b8	Fix DCI handling	2019-11-18 12:45:52 -08:00
Lane Roathe	527620de2e	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-18 12:03:43 -08:00
marketideas	0a5f52a2d0	test	2019-11-18 11:34:20 -08:00
marketideas	3fd0c7bcb5	test	2019-11-18 06:07:44 -08:00
marketideas	a80ff4a35c	making tests pass	2019-11-18 04:50:02 -08:00
Lane Roathe	a68c741800	Merge pull request #16 from lroathe/master ... Merge latest to master	2019-11-17 22:29:56 -08:00
Lane Roathe	77c75e94e4	Merge pull request #15 from lroathe/master ... Merge in sqq branch w/remaining string ops	2019-11-17 22:27:54 -08:00
Lane Roathe	97cc51e33e	Merge branch 'sgq_qasm_main' of https://github.com/marketideas/qasm	2019-11-17 22:20:34 -08:00
marketideas	1c7a91e5eb	test	2019-11-17 22:16:00 -08:00
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