diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-01-10 14:42:16 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-10 14:42:16 +0100 |
| commit | f976a2e341ce4573103d133d7b109d93abd616dd (patch) | |
| tree | 9d5e5a5a1f1eaf799ac219310b8807415fd0ad50 | |
| parent | 4440a9661bab2db3cf297e55ce01f09453b73532 (diff) | |
| parent | 3ee63ae7b498a1d7d232b0dcdcffb7f7f30c9579 (diff) | |
| download | otp-f976a2e341ce4573103d133d7b109d93abd616dd.tar.gz otp-f976a2e341ce4573103d133d7b109d93abd616dd.tar.bz2 otp-f976a2e341ce4573103d133d7b109d93abd616dd.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/hipe/flow/Makefile | 2 | ||||
| -rw-r--r-- | lib/hipe/flow/cfg.hrl | 5 | ||||
| -rw-r--r-- | lib/hipe/icode/Makefile | 2 | ||||
| -rw-r--r-- | lib/hipe/opt/Makefile | 2 | ||||
| -rw-r--r-- | lib/syntax_tools/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/syntax_tools/src/erl_syntax.erl | 6 |
6 files changed, 8 insertions, 11 deletions
diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile index 02f610587b..bbe8ef8666 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile @@ -65,7 +65,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html) include ../native.mk -ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec +warn_untyped_record +ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec # +warn_untyped_record # ---------------------------------------------------- # Targets diff --git a/lib/hipe/flow/cfg.hrl b/lib/hipe/flow/cfg.hrl index 79fe6162ad..62f47a707a 100644 --- a/lib/hipe/flow/cfg.hrl +++ b/lib/hipe/flow/cfg.hrl @@ -36,9 +36,8 @@ is_closure :: boolean(), closure_arity :: arity(), is_leaf :: boolean(), - params :: any(), %% any() since type information is missing? - info = [] :: list() %% this field seems not needed; take out?? - }). + params, % :: list() + info = []}). %% this field seems not needed; take out?? %% %% Data is a triple with a dict of constants, a list of labels and an integer diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile index eced90b0ec..bd6436c8b3 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile @@ -83,7 +83,7 @@ DOC_FILES= $(DOC_MODULES:%=$(DOCS)/%.html) include ../native.mk -ERL_COMPILE_FLAGS += +warn_unused_import +warn_missing_spec +warn_untyped_record +ERL_COMPILE_FLAGS += +warn_unused_import +warn_missing_spec # +warn_untyped_record # ---------------------------------------------------- # Targets diff --git a/lib/hipe/opt/Makefile b/lib/hipe/opt/Makefile index 74fde26c0b..4596201801 100644 --- a/lib/hipe/opt/Makefile +++ b/lib/hipe/opt/Makefile @@ -63,7 +63,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html) include ../native.mk -ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec +warn_untyped_record +ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec # +warn_untyped_record # ---------------------------------------------------- # Targets diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile index 50369e633e..bac138e95a 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -26,7 +26,7 @@ EBIN = ../ebin ifeq ($(NATIVE_LIBS_ENABLED),yes) ERL_COMPILE_FLAGS += +native endif -ERL_COMPILE_FLAGS += +warn_unused_vars +nowarn_shadow_vars +warn_unused_import +warn_missing_spec +warn_untyped_record +ERL_COMPILE_FLAGS += +warn_unused_vars +nowarn_shadow_vars +warn_unused_import # +warn_missing_spec +warn_untyped_record SOURCES=erl_syntax.erl erl_prettypr.erl erl_syntax_lib.erl \ erl_comment_scan.erl erl_recomment.erl erl_tidy.erl \ diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl index 4e2235d552..32fd3722d6 100644 --- a/lib/syntax_tools/src/erl_syntax.erl +++ b/lib/syntax_tools/src/erl_syntax.erl @@ -3523,10 +3523,7 @@ qualified_name_segments(Node) -> %% @see is_form/1 %% @see rule/2 --record(function, { - name :: atom(), - clauses :: list() - }). +-record(function, {name, clauses}). %% XXX: This one is problematic because there is a tuple with the same %% tag and size that comes from 'erl_parse' %% -record(function, {name :: syntaxTree(), clauses :: [syntaxTree()]}). @@ -6105,6 +6102,7 @@ implicit_fun_name(Node) -> set_pos(integer(Arity), Pos))); {'fun', _Pos, {function, Module, Atom, Arity}} -> %% New in R15: fun M:F/A. + %% XXX: Perhaps set position for this as well? module_qualifier(Module, arity_qualifier(Atom, Arity)); Node1 -> data(Node1) |