Merge changes #195

Closed
wants to merge 96 commits into
from

Conversation

Projects
None yet
3 participants
@ribrdb
Contributor

ribrdb commented Dec 5, 2012

I'm not sure if we want to merge all this before the new release.
There's a lot of changes here to give better error messages.
I've also started working on a new compiler backend written in Mirah, but it has to be built by hand right now so it shouldn't affect anything.

ribrdb and others added some commits Nov 2, 2012

Merge branch 'master' of https://github.com/mirah/mirah
Conflicts:
	Rakefile
	lib/mirah.rb
	lib/mirah/transform/ast_ext.rb
lib/mirah/jvm/compiler.rb
+ java_import 'org.mirah.jvm.compiler.Backend'
+ rescue NameError
+ $CLASSPATH << File.dirname(__FILE__) + '/../../../javalib/mirah-compiler.jar'
+ begin

This comment has been minimized.

Show comment Hide comment
@baroquebobcat

baroquebobcat Dec 5, 2012

Owner

Could you move the classpath munging here https://github.com/mirah/mirah/blob/master/lib/mirah.rb#L20
I've been consolidating the classpath changes in one place to make it easier to see which jars are added to the path.

@baroquebobcat

baroquebobcat Dec 5, 2012

Owner

Could you move the classpath munging here https://github.com/mirah/mirah/blob/master/lib/mirah.rb#L20
I've been consolidating the classpath changes in one place to make it easier to see which jars are added to the path.

This comment has been minimized.

Show comment Hide comment
@ribrdb

ribrdb Dec 5, 2012

Contributor

Moved.

@ribrdb

ribrdb Dec 5, 2012

Contributor

Moved.

ribrdb added some commits Dec 15, 2012

Implement more nodes
FunctionalCall, ImplicitNil, Cast, FieldAccess, FieldAssign, Return,
EmptyArray
Fix for static void method as an expression.
Evaluates to nil for backwards compatibility, but it seems like this is
wrong, probably should update the typer.
Fix test_string_concat
Convert String.+ to a macro.
Ignore synthetic methods in method_lookup.
Prefer methods from child rather than parent in method lookup.

@ribrdb ribrdb closed this Jan 26, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment