Merge branch 'pu/parameter-names' into wip
authorJean Privat <jean@pryen.org>
Wed, 12 Oct 2011 20:34:13 +0000 (16:34 -0400)
committerJean Privat <jean@pryen.org>
Thu, 13 Oct 2011 00:21:59 +0000 (20:21 -0400)
commit50db753cdb40501d9f9ea7db8e04b5a03f55b95e
tree4d8391484c09589c684694853b34040886d093b7
parentaed8bac2333bf7d41ae4622b697da3a8e0f4ec09
parent7216675ecb1d06a4055fdff8b09d722510314efa
Merge branch 'pu/parameter-names' into wip

Conflicts:
src/syntax/mmbuilder.nit
tests/sav/base_init_linext2_alt2.sav
tests/sav/base_init_linext2_alt4.sav
tests/sav/base_for_custom_alt3.sav
tests/sav/base_for_custom_alt4.sav
tests/sav/test_parser_args1.sav
tests/sav/test_parser_args2.sav
12 files changed:
src/metamodel/static_type.nit
src/syntax/mmbuilder.nit
src/syntax/syntax_base.nit
src/syntax/typing.nit
tests/sav/base_for_custom_alt3.sav
tests/sav/base_for_custom_alt4.sav
tests/sav/base_init_linext2_alt2.sav
tests/sav/base_init_linext2_alt4.sav
tests/sav/error_expr_not_ok_alt4.sav
tests/sav/error_expr_not_ok_alt5.sav
tests/sav/test_parser_args1.sav
tests/sav/test_parser_args2.sav