head	1.10;
access;
symbols
	charm6_1:1.10
	charm_6_0_1:1.10
	charm6_0_1:1.10;
locks; strict;
comment	@# @;


1.10
date	2008.12.16.21.43.59;	author abecker;	state Exp;
branches;
next	1.9;
commitid	CqtWF2eCBBAnQJut;

1.9
date	2008.12.16.21.43.31;	author abecker;	state Exp;
branches;
next	1.8;
commitid	Vmj7KzwGlQwdQJut;

1.8
date	2008.12.16.21.43.24;	author abecker;	state Exp;
branches;
next	1.7;
commitid	eoeMYvANm85bQJut;

1.7
date	2008.12.03.22.32.41;	author abecker;	state Exp;
branches;
next	1.6;
commitid	Avi9vrGy0EAZw4tt;

1.6
date	2008.08.18.22.47.42;	author abecker;	state Exp;
branches;
next	1.5;
commitid	0jgj46pyNQZ23kft;

1.5
date	2008.08.18.20.08.14;	author abecker;	state Exp;
branches;
next	1.4;
commitid	DUeJYDhmCMG2ajft;

1.4
date	2008.06.10.00.41.13;	author abecker;	state Exp;
branches;
next	1.3;
commitid	u5lT6eH2U1gZUk6t;

1.3
date	2008.06.09.07.36.12;	author abecker;	state Exp;
branches;
next	1.2;
commitid	KDl4oVYLstwhff6t;

1.2
date	2008.06.08.05.11.01;	author abecker;	state Exp;
branches;
next	1.1;
commitid	kgg6JnAKv1o2u66t;

1.1
date	2008.06.03.21.19.46;	author abecker;	state Exp;
branches;
next	;
commitid	Uwi6jzqmw7Yl0y5t;


desc
@@


1.10
log
@fixed stdlib path and added stdlib target
@
text
@ANT=ant -lib lib/ant-antlr3.jar
# Ant does the actual building, just invoke it
.DEFAULT_GOAL:dist
dist:
	$(ANT) dist
compile:
	$(ANT) compile
clean:
	$(ANT) clean
doc:
	$(ANT) doc
all:
	$(ANT) all

# The lousy antlrv3 ant task won't give proper output from antlr errors, so
# use these horrible direct invocations instead
debug-charj:
	cp src/charj/translator/Charj.g build/src/charj/translator/Charj.g
	java -classpath lib/antlr-2.7.7.jar:lib/antlr-3.1b1.jar:lib/antlr-runtime-3.1b1.jar:lib/stringtemplate-3.1.jar:lib/gunit-1.0.2.jar:lib/JSAP-2.1.jar org.antlr.Tool -o build/src/charj/translator -lib build/src/charj/translator build/src/charj/translator/Charj.g
debug-semantics:
	cp src/charj/translator/CharjSemantics.g build/src/charj/translator/CharjSemantics.g	
	java -classpath lib/antlr-2.7.7.jar:lib/antlr-3.1b1.jar:lib/antlr-runtime-3.1b1.jar:lib/stringtemplate-3.1.jar:lib/gunit-1.0.2.jar:lib/JSAP-2.1.jar org.antlr.Tool -o build/src/charj/translator -lib build/src/charj/translator build/src/charj/translator/CharjSemantics.g
debug-emitter:
	cp src/charj/translator/CharjEmitter.g build/src/charj/translator/CharjEmitter.g
	java -classpath lib/antlr-2.7.7.jar:lib/antlr-3.1b1.jar:lib/antlr-runtime-3.1b1.jar:lib/stringtemplate-3.1.jar:lib/gunit-1.0.2.jar:lib/JSAP-2.1.jar org.antlr.Tool -o build/src/charj/translator -lib build/src/charj/translator build/src/charj/translator/CharjEmitter.g

# For any unrecognized rules, try to compile a test program with that name
%:
	./bin/charjc --debug --verbose --AST --stdout tests/$@@.cj
@


1.9
log
@avoid stale antlr file problem for debug targets
@
text
@a14 1

a29 1

@


1.8
log
@improved target for tests
@
text
@d19 1
d22 1
d25 1
@


1.7
log
@fixed horrible debug target path hack
@
text
@a14 3
test:
	./bin/charjc --debug --verbose --AST --stdout tests/Hello.cj

d24 5
@


1.6
log
@added semantics debugging rule to makefile
made nicer scope stack mechanism, as in mantra example
got rid of some do-nothing code in semantics.g
@
text
@a1 1

d22 1
a22 1
	java -classpath /Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-2.7.7.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-3.1b1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-runtime-3.1b1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/stringtemplate-3.1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/gunit-1.0.2.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/JSAP-2.1.jar org.antlr.Tool -o /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator -lib /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator/Charj.g
d24 1
a24 1
	java -classpath /Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-2.7.7.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-3.1b1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-runtime-3.1b1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/stringtemplate-3.1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/gunit-1.0.2.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/JSAP-2.1.jar org.antlr.Tool -o /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator -lib /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator/CharjSemantics.g
d26 1
a26 1
	java -classpath /Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-2.7.7.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-3.1b1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/antlr-runtime-3.1b1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/stringtemplate-3.1.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/gunit-1.0.2.jar:/Users/abecker/Documents/workspace/charm/src/langs/charj/lib/JSAP-2.1.jar org.antlr.Tool -o /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator -lib /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator /Users/abecker/Documents/workspace/charm/src/langs/charj/build/src/charj/translator/CharjEmitter.g
@


1.5
log
@major improvements to symbol table
added some type resolution logic
greatly improved efficiency of translation passes
added AST output capability
simplified scope objects
better flow control and less redundancy in main driver
small tweaks to language grammar
@
text
@d24 2
@


1.4
log
@Added embed keyword and functionality
Added all c++ keywords as charj keywords to prevent incompatibilities
Improved import mechanism for inheritance
Nicer looking block output
Added special debugging cases to makefile
Added embed block to test case
fixed block templates to allow child output
@
text
@d17 1
a17 1
	./bin/charjc --debug --verbose --stdout tests/Hello.cj
@


1.3
log
@consolidated and improved templates
implemented .h code generation
fixed charmxi output directory problem
fixed method type code generation bug
@
text
@d19 7
@


1.2
log
@improved command-line parsing, now passes extra arguments through to charmc
better control of what gets written to stdout, with nicer formatting
@
text
@d17 1
a17 1
	./bin/charjc --debug --verbose --stdout tests/hello.cj
@


1.1
log
@new, way better build system, tests, and template output
@
text
@d17 1
a17 1
	./bin/charjc tests/hello.cj
@

