From 08de8afde6c99fb1739eb9730e6fce4eef54f296 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 20 Sep 2012 09:58:20 -0700 Subject: Normalized line endings. This brings all the files into line with the .gitattributes settings, which should henceforth be automatically maintained by git. --- .../scala/tools/ant/templates/tool-windows.tmpl | 182 ++++++++-------- test/disabled-windows/script/utf8.bat | 22 +- test/disabled/script/fact.bat | 34 +-- test/disabled/script/second.bat | 6 +- test/disabled/script/t1015.bat | 24 +-- test/disabled/script/t1017.bat | 30 +-- test/files/jvm/manifests-new.check | 116 +++++----- test/files/jvm/mkLibNatives.bat | 140 ++++++------ test/files/neg/checksensible.check | 200 ++++++++--------- .../neg/classmanifests_new_deprecations.check | 122 +++++------ test/files/neg/classtags_contextbound_a.check | 8 +- test/files/neg/classtags_contextbound_b.check | 8 +- test/files/neg/classtags_contextbound_c.check | 8 +- test/files/neg/classtags_dont_use_typetags.check | 8 +- ...interop_abstypetags_arenot_classmanifests.check | 8 +- .../neg/interop_abstypetags_arenot_classtags.check | 8 +- .../neg/interop_abstypetags_arenot_manifests.check | 8 +- .../interop_classmanifests_arenot_typetags.check | 8 +- .../neg/interop_classtags_arenot_manifests.check | 8 +- .../interop_typetags_arenot_classmanifests.check | 8 +- .../neg/interop_typetags_arenot_classtags.check | 8 +- ...petags_without_classtags_arenot_manifests.check | 12 +- test/files/neg/macro-basic-mamdmi.check | 8 +- test/files/neg/macro-deprecate-idents.check | 104 ++++----- test/files/neg/macro-invalidimpl-a.check | 8 +- test/files/neg/macro-invalidimpl-b.check | 8 +- test/files/neg/macro-invalidimpl-c.check | 8 +- test/files/neg/macro-invalidimpl-d.check | 8 +- test/files/neg/macro-invalidimpl-e.check | 26 +-- test/files/neg/macro-invalidimpl-f.check | 14 +- test/files/neg/macro-invalidimpl-g.check | 14 +- test/files/neg/macro-invalidimpl-h.check | 8 +- test/files/neg/macro-invalidimpl-i.check | 8 +- test/files/neg/macro-invalidret-nontree.check | 14 +- .../neg/macro-invalidret-nonuniversetree.check | 14 +- test/files/neg/macro-invalidshape-a.check | 10 +- test/files/neg/macro-invalidshape-b.check | 10 +- test/files/neg/macro-invalidshape-c.check | 18 +- test/files/neg/macro-invalidshape-d.check | 16 +- .../neg/macro-invalidsig-context-bounds.check | 14 +- test/files/neg/macro-invalidsig-ctx-badargc.check | 14 +- test/files/neg/macro-invalidsig-ctx-badtype.check | 14 +- .../neg/macro-invalidsig-ctx-badvarargs.check | 14 +- test/files/neg/macro-invalidsig-ctx-noctx.check | 14 +- .../neg/macro-invalidsig-implicit-params.check | 14 +- .../neg/macro-invalidsig-params-badargc.check | 14 +- .../neg/macro-invalidsig-params-badtype.check | 14 +- .../neg/macro-invalidsig-params-badvarargs.check | 14 +- .../neg/macro-invalidsig-params-namemismatch.check | 14 +- .../neg/macro-invalidsig-tparams-badtype.check | 14 +- .../neg/macro-invalidsig-tparams-bounds-a.check | 8 +- .../neg/macro-invalidsig-tparams-bounds-b.check | 8 +- .../neg/macro-invalidsig-tparams-notparams-a.check | 8 +- .../neg/macro-invalidsig-tparams-notparams-b.check | 8 +- .../neg/macro-invalidsig-tparams-notparams-c.check | 8 +- test/files/neg/macro-invalidusage-badargs.check | 12 +- .../files/neg/macro-invalidusage-badbounds-a.check | 8 +- test/files/neg/macro-invalidusage-badtargs.check | 8 +- .../neg/macro-invalidusage-methodvaluesyntax.check | 8 +- test/files/neg/macro-noexpand.check | 8 +- test/files/neg/macro-nontypeablebody.check | 8 +- ...verride-macro-overrides-abstract-method-a.check | 10 +- ...verride-macro-overrides-abstract-method-b.check | 10 +- .../macro-override-method-overrides-macro.check | 10 +- .../macro-reify-typetag-hktypeparams-notags.check | 14 +- .../macro-reify-typetag-typeparams-notags.check | 14 +- .../neg/macro-reify-typetag-useabstypetag.check | 14 +- test/files/neg/reify_ann2b.check | 8 +- .../reify_metalevel_breach_+0_refers_to_1.check | 14 +- .../reify_metalevel_breach_-1_refers_to_0_a.check | 14 +- .../reify_metalevel_breach_-1_refers_to_0_b.check | 14 +- .../reify_metalevel_breach_-1_refers_to_1.check | 14 +- .../neg/reify_nested_inner_refers_to_local.check | 14 +- test/files/neg/t2775.check | 8 +- test/files/neg/t3507-old.check | 8 +- test/files/neg/t5452-new.check | 16 +- test/files/neg/t5452-old.check | 16 +- test/files/neg/t5689.check | 14 +- test/files/neg/t5692a.check | 8 +- test/files/neg/t5692b.check | 8 +- test/files/neg/t6323a.check | 18 +- test/files/pos/t5245.scala | 2 +- test/files/run/abstypetags_core.check | 60 +++--- test/files/run/abstypetags_serialize.check | 4 +- test/files/run/classmanifests_new_alias.check | 4 +- test/files/run/classmanifests_new_core.check | 4 +- test/files/run/classtags_contextbound.check | 2 +- test/files/run/classtags_core.check | 60 +++--- test/files/run/classtags_multi.check | 10 +- test/files/run/existentials3-new.check | 48 ++--- test/files/run/exprs_serialize.check | 4 +- test/files/run/freetypes_false_alarm1.check | 2 +- .../run/interop_classtags_are_classmanifests.check | 6 +- .../run/interop_manifests_are_abstypetags.check | 6 +- .../run/interop_manifests_are_classtags.check | 36 ++-- .../files/run/interop_manifests_are_typetags.check | 6 +- .../files/run/interop_typetags_are_manifests.check | 6 +- test/files/run/macro-abort-fresh.check | 12 +- test/files/run/macro-declared-in-annotation.check | 2 +- test/files/run/macro-declared-in-block.check | 4 +- test/files/run/macro-declared-in-class-class.check | 4 +- .../files/run/macro-declared-in-class-object.check | 4 +- test/files/run/macro-declared-in-class.check | 4 +- .../run/macro-declared-in-default-param.check | 10 +- .../run/macro-declared-in-implicit-class.check | 4 +- test/files/run/macro-declared-in-method.check | 4 +- .../files/run/macro-declared-in-object-class.check | 4 +- .../run/macro-declared-in-object-object.check | 4 +- test/files/run/macro-declared-in-object.check | 4 +- .../run/macro-declared-in-package-object.check | 4 +- test/files/run/macro-declared-in-refinement.check | 4 +- test/files/run/macro-declared-in-trait.check | 30 +-- test/files/run/macro-def-infer-return-type-b.check | 12 +- test/files/run/macro-def-path-dependent-a.check | 2 +- test/files/run/macro-def-path-dependent-b.check | 2 +- test/files/run/macro-def-path-dependent-c.check | 2 +- test/files/run/macro-def-path-dependent-d1.check | 2 +- test/files/run/macro-def-path-dependent-d2.check | 2 +- .../files/run/macro-expand-implicit-argument.check | 2 +- .../macro-expand-implicit-macro-has-implicit.check | 2 +- .../macro-expand-implicit-macro-is-implicit.check | 4 +- .../run/macro-expand-implicit-macro-is-val.check | 2 +- .../run/macro-expand-implicit-macro-is-view.check | 2 +- test/files/run/macro-expand-nullary-generic.check | 12 +- test/files/run/macro-expand-overload.check | 12 +- test/files/run/macro-expand-override.check | 30 +-- test/files/run/macro-expand-recursive.check | 2 +- test/files/run/macro-expand-tparams-explicit.check | 2 +- test/files/run/macro-expand-tparams-implicit.check | 4 +- test/files/run/macro-expand-tparams-optional.check | 2 +- test/files/run/macro-expand-tparams-prefix-a.check | 8 +- test/files/run/macro-expand-tparams-prefix-b.check | 4 +- .../files/run/macro-expand-tparams-prefix-c1.check | 6 +- .../files/run/macro-expand-tparams-prefix-c2.check | 6 +- .../files/run/macro-expand-tparams-prefix-d1.check | 6 +- ...pand-varargs-explicit-over-nonvarargs-bad.check | 6 +- ...and-varargs-explicit-over-nonvarargs-good.check | 2 +- ...acro-expand-varargs-explicit-over-varargs.check | 2 +- ...o-expand-varargs-implicit-over-nonvarargs.check | 2 +- ...acro-expand-varargs-implicit-over-varargs.check | 2 +- test/files/run/macro-impl-default-params.check | 10 +- test/files/run/macro-impl-rename-context.check | 4 +- ...-invalidret-doesnt-conform-to-def-rettype.check | 6 +- test/files/run/macro-invalidret-nontypeable.check | 6 +- test/files/run/macro-invalidusage-badret.check | 6 +- ...alidusage-partialapplication-with-tparams.check | 6 +- .../macro-invalidusage-partialapplication.check | 6 +- test/files/run/macro-openmacros.check | 6 +- .../run/macro-reify-abstypetag-notypeparams.check | 4 +- .../macro-reify-abstypetag-typeparams-notags.check | 4 +- .../macro-reify-abstypetag-typeparams-tags.check | 4 +- .../run/macro-reify-abstypetag-usetypetag.check | 4 +- test/files/run/macro-reify-basic.check | 2 +- test/files/run/macro-reify-freevars.check | 6 +- .../files/run/macro-reify-ref-to-packageless.check | 2 +- .../run/macro-reify-splice-outside-reify.check | 2 +- test/files/run/macro-reify-splice-splice.check | 2 +- test/files/run/macro-reify-tagful-a.check | 2 +- test/files/run/macro-reify-tagless-a.check | 6 +- .../run/macro-reify-typetag-notypeparams.check | 4 +- .../run/macro-reify-typetag-typeparams-tags.check | 4 +- test/files/run/macro-reify-unreify.check | 2 +- test/files/run/macro-repl-basic.check | 108 +++++----- test/files/run/macro-repl-dontexpand.check | 24 +-- test/files/run/macro-settings.check | 2 +- test/files/run/macro-sip19-revised.check | 10 +- test/files/run/macro-sip19.check | 10 +- .../run/macro-typecheck-implicitsdisabled.check | 4 +- .../files/run/macro-typecheck-macrosdisabled.check | 64 +++--- .../run/macro-typecheck-macrosdisabled2.check | 64 +++--- test/files/run/macro-undetparams-consfromsls.check | 10 +- test/files/run/macro-undetparams-implicitval.check | 2 +- test/files/run/macro-undetparams-macroitself.check | 4 +- test/files/run/newTags.check | 6 +- test/files/run/partialfun.check | 12 +- test/files/run/partialfun.scala | 172 +++++++-------- test/files/run/primitive-sigs-2-new.check | 14 +- test/files/run/primitive-sigs-2-old.check | 14 +- .../files/run/reflection-allmirrors-tostring.check | 28 +-- ...eflection-constructormirror-inner-badpath.check | 4 +- .../reflection-constructormirror-inner-good.check | 2 +- ...flection-constructormirror-nested-badpath.check | 4 +- .../reflection-constructormirror-nested-good.check | 2 +- ...ection-constructormirror-toplevel-badpath.check | 4 +- ...eflection-constructormirror-toplevel-good.check | 2 +- test/files/run/reflection-enclosed-basic.check | 36 ++-- .../run/reflection-enclosed-inner-basic.check | 40 ++-- .../reflection-enclosed-inner-inner-basic.check | 40 ++-- .../reflection-fieldmirror-accessorsareokay.check | 12 +- .../run/reflection-fieldmirror-ctorparam.check | 2 +- .../run/reflection-fieldmirror-getsetval.check | 4 +- .../run/reflection-fieldmirror-getsetvar.check | 4 +- ...flection-fieldmirror-nmelocalsuffixstring.check | 2 +- .../run/reflection-fieldmirror-privatethis.check | 6 +- .../run/reflection-fieldsymbol-navigation.check | 12 +- test/files/run/reflection-implicit.check | 4 +- .../files/run/reflection-magicsymbols-invoke.check | 236 ++++++++++----------- test/files/run/reflection-magicsymbols-repl.check | 78 +++---- .../run/reflection-magicsymbols-vanilla.check | 16 +- .../files/run/reflection-methodsymbol-params.check | 16 +- .../run/reflection-methodsymbol-returntype.check | 16 +- .../run/reflection-methodsymbol-typeparams.check | 16 +- .../reflection-modulemirror-inner-badpath.check | 4 +- .../run/reflection-modulemirror-inner-good.check | 2 +- .../reflection-modulemirror-nested-badpath.check | 4 +- .../run/reflection-modulemirror-nested-good.check | 2 +- .../reflection-modulemirror-toplevel-badpath.check | 4 +- test/files/run/reflection-repl-classes.check | 70 +++--- test/files/run/reflection-repl-elementary.check | 18 +- test/files/run/reflection-sorted-decls.check | 6 +- test/files/run/reflection-sorted-members.check | 8 +- .../run/reflection-valueclasses-derived.check | 6 +- .../run/reflection-valueclasses-standard.check | 54 ++--- test/files/run/reify-aliases.check | 2 +- test/files/run/reify-repl-fail-gracefully.check | 42 ++-- test/files/run/reify-staticXXX.check | 48 ++--- test/files/run/reify_ann1a.check | 60 +++--- test/files/run/reify_ann1b.check | 60 +++--- test/files/run/reify_ann2a.check | 88 ++++---- test/files/run/reify_ann3.check | 42 ++-- test/files/run/reify_ann4.check | 64 +++--- test/files/run/reify_ann5.check | 44 ++-- test/files/run/reify_classfileann_a.check | 36 ++-- test/files/run/reify_classfileann_b.check | 40 ++-- test/files/run/reify_closure8b.check | 6 +- test/files/run/reify_copypaste1.check | 4 +- .../run/reify_nested_inner_refers_to_global.check | 2 +- .../run/reify_nested_outer_refers_to_global.check | 2 +- .../run/reify_nested_outer_refers_to_local.check | 2 +- test/files/run/reify_newimpl_11.check | 4 +- test/files/run/reify_newimpl_13.check | 4 +- test/files/run/reify_newimpl_18.check | 2 +- test/files/run/reify_newimpl_19.check | 4 +- test/files/run/reify_newimpl_20.check | 2 +- test/files/run/reify_newimpl_21.check | 2 +- test/files/run/reify_newimpl_22.check | 58 ++--- test/files/run/reify_newimpl_23.check | 56 ++--- test/files/run/reify_newimpl_25.check | 38 ++-- test/files/run/reify_newimpl_26.check | 42 ++-- test/files/run/reify_newimpl_27.check | 2 +- test/files/run/reify_newimpl_29.check | 2 +- test/files/run/reify_newimpl_30.check | 2 +- test/files/run/reify_newimpl_31.check | 2 +- test/files/run/reify_newimpl_33.check | 2 +- test/files/run/reify_newimpl_35.check | 34 +-- test/files/run/reify_newimpl_36.check | 2 +- test/files/run/reify_newimpl_37.check | 2 +- test/files/run/reify_newimpl_38.check | 2 +- test/files/run/reify_newimpl_39.check | 2 +- test/files/run/reify_newimpl_40.check | 2 +- test/files/run/repl-power.check | 64 +++--- test/files/run/runtimeEval2.check | 2 +- test/files/run/showraw_mods.check | 2 +- test/files/run/showraw_tree.check | 4 +- test/files/run/showraw_tree_ids.check | 4 +- test/files/run/showraw_tree_kinds.check | 4 +- test/files/run/showraw_tree_types_ids.check | 20 +- test/files/run/showraw_tree_types_typed.check | 20 +- test/files/run/showraw_tree_types_untyped.check | 4 +- test/files/run/showraw_tree_ultimate.check | 20 +- test/files/run/t1195-new.check | 12 +- test/files/run/t1195-old.check | 12 +- test/files/run/t2386-new.check | 4 +- test/files/run/t2886.check | 10 +- test/files/run/t3507-new.check | 2 +- test/files/run/t4110-new.check | 4 +- test/files/run/t4216.check | 74 +++---- test/files/run/t4835.check | 14 +- test/files/run/t4835.scala | 76 +++---- test/files/run/t4935.check | 2 +- test/files/run/t4935.scala | 18 +- test/files/run/t5224.check | 18 +- test/files/run/t5225_1.check | 8 +- test/files/run/t5225_2.check | 8 +- test/files/run/t5256c.check | 6 +- test/files/run/t5256g.check | 6 +- test/files/run/t5256h.check | 6 +- test/files/run/t5271_1.check | 24 +-- test/files/run/t5271_2.check | 28 +-- test/files/run/t5271_3.check | 42 ++-- test/files/run/t5418a.check | 2 +- test/files/run/t5418b.check | 4 +- test/files/run/t5419.check | 2 +- test/files/run/t5680.check | 6 +- test/files/run/t5704.check | 2 +- test/files/run/t5713.check | 2 +- test/files/run/t5770.check | 20 +- test/files/run/t5816.check | 2 +- test/files/run/t5881.check | 4 +- test/files/run/t5943a1.check | 2 +- test/files/run/t5943a2.check | 2 +- test/files/run/t6086-repl.check | 24 +-- test/files/run/t6086-vanilla.check | 2 +- test/files/run/t6188.check | 2 +- test/files/run/t6199-mirror.check | 2 +- test/files/run/t6199-toolbox.check | 2 +- test/files/run/t6287.check | 6 +- test/files/run/t6318_derived.check | 6 +- test/files/run/t6318_primitives.check | 72 +++---- test/files/run/t6323b.check | 2 +- test/files/run/t6329_repl.check | 26 +-- test/files/run/t6329_repl_bug.check | 26 +-- test/files/run/t6329_vanilla.check | 4 +- test/files/run/t6329_vanilla_bug.check | 4 +- test/files/run/t6392a.check | 2 +- test/files/run/t6392b.check | 2 +- test/files/run/t6394b.check | 2 +- test/files/run/test-cpp.check | 130 ++++++------ .../run/toolbox_default_reporter_is_silent.check | 2 +- .../run/toolbox_typecheck_implicitsdisabled.check | 10 +- .../run/toolbox_typecheck_inferimplicitvalue.check | 2 +- .../run/toolbox_typecheck_macrosdisabled.check | 82 +++---- .../run/toolbox_typecheck_macrosdisabled2.check | 82 +++---- test/files/run/typetags_core.check | 60 +++--- test/files/run/typetags_serialize.check | 4 +- .../run/valueclasses-classmanifest-basic.check | 2 +- .../valueclasses-classmanifest-existential.check | 2 +- .../run/valueclasses-classmanifest-generic.check | 2 +- test/files/run/valueclasses-classtag-basic.check | 2 +- .../run/valueclasses-classtag-existential.check | 2 +- test/files/run/valueclasses-classtag-generic.check | 2 +- test/files/run/valueclasses-manifest-basic.check | 2 +- .../run/valueclasses-manifest-existential.check | 2 +- test/files/run/valueclasses-manifest-generic.check | 2 +- test/files/run/valueclasses-typetag-basic.check | 2 +- .../run/valueclasses-typetag-existential.check | 2 +- test/files/run/valueclasses-typetag-generic.check | 2 +- test/files/run/virtpatmat_typetag.check | 20 +- test/partest.bat | 208 +++++++++--------- .../neg/macro-invalidusage-badbounds-b.check | 8 +- test/pending/neg/reify_packed.check | 8 +- ...and-implicit-macro-defeats-type-inference.check | 12 +- test/pending/run/macro-reify-tagless-b.check | 4 +- .../macro-reify-typetag-hktypeparams-notags.check | 4 +- tools/get-scala-commit-date.bat | 16 +- tools/get-scala-commit-sha.bat | 16 +- 336 files changed, 2948 insertions(+), 2948 deletions(-) diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 3c0d1d77ca..a347df6d6e 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -1,91 +1,91 @@ -@@echo off - -rem ########################################################################## -rem # Copyright 2002-2012 LAMP/EPFL -rem # -rem # This is free software; see the distribution for copying conditions. -rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -rem # PARTICULAR PURPOSE. -rem ########################################################################## - -setlocal enableextensions enabledelayedexpansion - -set _LINE_TOOLCP= - -:another_param - -if "%1%"=="-toolcp" ( - set _LINE_TOOLCP=%2% - shift - shift - goto another_param -) - -set _LINE_PARAMS=%1 -:param_loop -shift -if [%1]==[] goto param_afterloop -set _LINE_PARAMS=%_LINE_PARAMS% %1 -goto param_loop -:param_afterloop -if "%OS%" NEQ "Windows_NT" ( - echo "Warning, your version of Windows is not supported. Attempting to start scala anyway." -) - -@@setlocal -call :set_home - -rem We use the value of the JAVACMD environment variable if defined -set _JAVACMD=%JAVACMD% - -if not defined _JAVACMD ( - if not "%JAVA_HOME%"=="" ( - if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe" - ) -) - -if "%_JAVACMD%"=="" set _JAVACMD=java - -rem We use the value of the JAVA_OPTS environment variable if defined -set _JAVA_OPTS=%JAVA_OPTS% -if not defined _JAVA_OPTS set _JAVA_OPTS=@javaflags@ - -set _TOOL_CLASSPATH=@classpath@ -if "%_TOOL_CLASSPATH%"=="" ( - for %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f" - for /d %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f" -) - -if not "%_LINE_TOOLCP%"=="" call :add_cpath "%_LINE_TOOLCP%" - -set _PROPS=-Dscala.home="!_SCALA_HOME!" -Denv.emacs="%EMACS%" -Dscala.usejavacp=true @properties@ - -rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %* -"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %* -goto end - -rem ########################################################################## -rem # subroutines - -:add_cpath - if "%_TOOL_CLASSPATH%"=="" ( - set _TOOL_CLASSPATH=%~1 - ) else ( - set _TOOL_CLASSPATH=%_TOOL_CLASSPATH%;%~1 - ) -goto :eof - -rem Variable "%~dps0" works on WinXP SP2 or newer -rem (see http://support.microsoft.com/?kbid=833431) -rem set _SCALA_HOME=%~dps0.. -:set_home - set _BIN_DIR= - for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi - set _SCALA_HOME=%_BIN_DIR%.. -goto :eof - -:end -@@endlocal - -REM exit code fix, see http://stackoverflow.com/questions/4632891/exiting-batch-with-exit-b-x-where-x-1-acts-as-if-command-completed-successfu -@@%COMSPEC% /C exit %errorlevel% >nul +@@echo off + +rem ########################################################################## +rem # Copyright 2002-2012 LAMP/EPFL +rem # +rem # This is free software; see the distribution for copying conditions. +rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +rem # PARTICULAR PURPOSE. +rem ########################################################################## + +setlocal enableextensions enabledelayedexpansion + +set _LINE_TOOLCP= + +:another_param + +if "%1%"=="-toolcp" ( + set _LINE_TOOLCP=%2% + shift + shift + goto another_param +) + +set _LINE_PARAMS=%1 +:param_loop +shift +if [%1]==[] goto param_afterloop +set _LINE_PARAMS=%_LINE_PARAMS% %1 +goto param_loop +:param_afterloop +if "%OS%" NEQ "Windows_NT" ( + echo "Warning, your version of Windows is not supported. Attempting to start scala anyway." +) + +@@setlocal +call :set_home + +rem We use the value of the JAVACMD environment variable if defined +set _JAVACMD=%JAVACMD% + +if not defined _JAVACMD ( + if not "%JAVA_HOME%"=="" ( + if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe" + ) +) + +if "%_JAVACMD%"=="" set _JAVACMD=java + +rem We use the value of the JAVA_OPTS environment variable if defined +set _JAVA_OPTS=%JAVA_OPTS% +if not defined _JAVA_OPTS set _JAVA_OPTS=@javaflags@ + +set _TOOL_CLASSPATH=@classpath@ +if "%_TOOL_CLASSPATH%"=="" ( + for %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f" + for /d %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f" +) + +if not "%_LINE_TOOLCP%"=="" call :add_cpath "%_LINE_TOOLCP%" + +set _PROPS=-Dscala.home="!_SCALA_HOME!" -Denv.emacs="%EMACS%" -Dscala.usejavacp=true @properties@ + +rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %* +"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %* +goto end + +rem ########################################################################## +rem # subroutines + +:add_cpath + if "%_TOOL_CLASSPATH%"=="" ( + set _TOOL_CLASSPATH=%~1 + ) else ( + set _TOOL_CLASSPATH=%_TOOL_CLASSPATH%;%~1 + ) +goto :eof + +rem Variable "%~dps0" works on WinXP SP2 or newer +rem (see http://support.microsoft.com/?kbid=833431) +rem set _SCALA_HOME=%~dps0.. +:set_home + set _BIN_DIR= + for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi + set _SCALA_HOME=%_BIN_DIR%.. +goto :eof + +:end +@@endlocal + +REM exit code fix, see http://stackoverflow.com/questions/4632891/exiting-batch-with-exit-b-x-where-x-1-acts-as-if-command-completed-successfu +@@%COMSPEC% /C exit %errorlevel% >nul diff --git a/test/disabled-windows/script/utf8.bat b/test/disabled-windows/script/utf8.bat index 8bc5c886f7..73c72569b3 100755 --- a/test/disabled-windows/script/utf8.bat +++ b/test/disabled-windows/script/utf8.bat @@ -1,11 +1,11 @@ -::#! -:: utf8 - . - -@echo off -call scala -nocompdaemon %0 %* -goto :eof -::!# - -/*Comment Комментарий*/ -Console.println("QWERTY"); -Console.println("ЙЦУКЕН"); +::#! +:: utf8 - . + +@echo off +call scala -nocompdaemon %0 %* +goto :eof +::!# + +/*Comment Комментарий*/ +Console.println("QWERTY"); +Console.println("ЙЦУКЕН"); diff --git a/test/disabled/script/fact.bat b/test/disabled/script/fact.bat index bee0ba25c6..6f02b62a36 100755 --- a/test/disabled/script/fact.bat +++ b/test/disabled/script/fact.bat @@ -1,17 +1,17 @@ -::#! -:: fact - A simple Scala batch file that prints out the factorial -:: of the argument specified on the command line. - -@echo off -call scala -nocompdaemon %0 %* -goto :eof -::!# - - -val x = argv(0).toInt - -def fact(x: Int):Int = - if(x==0) 1 - else x*fact(x-1) - -Console.println("fact(" + x + ") = " + fact(x)) +::#! +:: fact - A simple Scala batch file that prints out the factorial +:: of the argument specified on the command line. + +@echo off +call scala -nocompdaemon %0 %* +goto :eof +::!# + + +val x = argv(0).toInt + +def fact(x: Int):Int = + if(x==0) 1 + else x*fact(x-1) + +Console.println("fact(" + x + ") = " + fact(x)) diff --git a/test/disabled/script/second.bat b/test/disabled/script/second.bat index 0d7085954d..222372d543 100755 --- a/test/disabled/script/second.bat +++ b/test/disabled/script/second.bat @@ -1,3 +1,3 @@ -@echo off - -scala -nocompdaemon -e "println(\"My second argument is \" + args(1))" arg1 arg2 +@echo off + +scala -nocompdaemon -e "println(\"My second argument is \" + args(1))" arg1 arg2 diff --git a/test/disabled/script/t1015.bat b/test/disabled/script/t1015.bat index 7475313d7e..4eddc800a8 100755 --- a/test/disabled/script/t1015.bat +++ b/test/disabled/script/t1015.bat @@ -1,12 +1,12 @@ -::#! -:: t1015 - . - -@echo off -call scala -nocompdaemon %0 %* -goto :eof -::!# - -case class Test(one : Int, two : Int) -object Test{ - def apply(one : Int): Test = Test(one, 2); -} +::#! +:: t1015 - . + +@echo off +call scala -nocompdaemon %0 %* +goto :eof +::!# + +case class Test(one : Int, two : Int) +object Test{ + def apply(one : Int): Test = Test(one, 2); +} diff --git a/test/disabled/script/t1017.bat b/test/disabled/script/t1017.bat index 369dbd2aca..0df49c663c 100755 --- a/test/disabled/script/t1017.bat +++ b/test/disabled/script/t1017.bat @@ -1,15 +1,15 @@ -::#! -::# t1017 - . - -@echo off -call scala -nocompdaemon %0 %* -goto :eof -::!# - -def foo = { - bar -} - -var x = 1 - -def bar = 1 +::#! +::# t1017 - . + +@echo off +call scala -nocompdaemon %0 %* +goto :eof +::!# + +def foo = { + bar +} + +var x = 1 + +def bar = 1 diff --git a/test/files/jvm/manifests-new.check b/test/files/jvm/manifests-new.check index 1c0bf6a568..a1ff9491cf 100644 --- a/test/files/jvm/manifests-new.check +++ b/test/files/jvm/manifests-new.check @@ -1,58 +1,58 @@ -x=(), t=TypeTag[Unit], k=TypeRef, s=class Unit -x=true, t=TypeTag[Boolean], k=TypeRef, s=class Boolean -x=a, t=TypeTag[Char], k=TypeRef, s=class Char -x=1, t=TypeTag[Int], k=TypeRef, s=class Int -x=abc, t=TypeTag[java.lang.String], k=TypeRef, s=class String -x='abc, t=TypeTag[Symbol], k=TypeRef, s=class Symbol - -x=List(()), t=TypeTag[List[Unit]], k=TypeRef, s=class List -x=List(true), t=TypeTag[List[Boolean]], k=TypeRef, s=class List -x=List(1), t=TypeTag[List[Int]], k=TypeRef, s=class List -x=List(abc), t=TypeTag[List[java.lang.String]], k=TypeRef, s=class List -x=List('abc), t=TypeTag[List[Symbol]], k=TypeRef, s=class List - -x=[Z, t=TypeTag[Array[Boolean]], k=TypeRef, s=class Array -x=[C, t=TypeTag[Array[Char]], k=TypeRef, s=class Array -x=[I, t=TypeTag[Array[Int]], k=TypeRef, s=class Array -x=[Ljava.lang.String;, t=TypeTag[Array[java.lang.String]], k=TypeRef, s=class Array -x=[Lscala.Symbol;, t=TypeTag[Array[Symbol]], k=TypeRef, s=class Array - -x=((),()), t=TypeTag[(Unit, Unit)], k=TypeRef, s=class Tuple2 -x=(true,false), t=TypeTag[(Boolean, Boolean)], k=TypeRef, s=class Tuple2 -x=(1,2), t=TypeTag[(Int, Int)], k=TypeRef, s=class Tuple2 -x=(abc,xyz), t=TypeTag[(java.lang.String, java.lang.String)], k=TypeRef, s=class Tuple2 -x=('abc,'xyz), t=TypeTag[(Symbol, Symbol)], k=TypeRef, s=class Tuple2 - -x=Test$, t=TypeTag[Test.type], k=SingleType, s=object Test -x=scala.collection.immutable.List$, t=TypeTag[scala.collection.immutable.List.type], k=SingleType, s=object List - -x=Foo, t=TypeTag[Foo[Int]], k=TypeRef, s=class Foo -x=Foo, t=TypeTag[Foo[List[Int]]], k=TypeRef, s=class Foo -x=Foo, t=TypeTag[Foo[Foo[Int]]], k=TypeRef, s=class Foo -x=Foo, t=TypeTag[Foo[List[Foo[Int]]]], k=TypeRef, s=class Foo - -x=Test1$$anon$1, t=TypeTag[Bar[String]], k=RefinedType, s= -x=Test1$$anon$2, t=TypeTag[Bar[String]], k=RefinedType, s= - -()=() -true=true -a=a -1=1 -'abc='abc - -List(())=List(()) -List(true)=List(true) -List('abc)=List('abc) - -Array()=Array() -Array(true)=Array(true) -Array(a)=Array(a) -Array(1)=Array(1) - -((),())=((),()) -(true,false)=(true,false) - -List(List(1), List(2))=List(List(1), List(2)) - -Array(Array(1), Array(2))=Array(Array(1), Array(2)) - +x=(), t=TypeTag[Unit], k=TypeRef, s=class Unit +x=true, t=TypeTag[Boolean], k=TypeRef, s=class Boolean +x=a, t=TypeTag[Char], k=TypeRef, s=class Char +x=1, t=TypeTag[Int], k=TypeRef, s=class Int +x=abc, t=TypeTag[java.lang.String], k=TypeRef, s=class String +x='abc, t=TypeTag[Symbol], k=TypeRef, s=class Symbol + +x=List(()), t=TypeTag[List[Unit]], k=TypeRef, s=class List +x=List(true), t=TypeTag[List[Boolean]], k=TypeRef, s=class List +x=List(1), t=TypeTag[List[Int]], k=TypeRef, s=class List +x=List(abc), t=TypeTag[List[java.lang.String]], k=TypeRef, s=class List +x=List('abc), t=TypeTag[List[Symbol]], k=TypeRef, s=class List + +x=[Z, t=TypeTag[Array[Boolean]], k=TypeRef, s=class Array +x=[C, t=TypeTag[Array[Char]], k=TypeRef, s=class Array +x=[I, t=TypeTag[Array[Int]], k=TypeRef, s=class Array +x=[Ljava.lang.String;, t=TypeTag[Array[java.lang.String]], k=TypeRef, s=class Array +x=[Lscala.Symbol;, t=TypeTag[Array[Symbol]], k=TypeRef, s=class Array + +x=((),()), t=TypeTag[(Unit, Unit)], k=TypeRef, s=class Tuple2 +x=(true,false), t=TypeTag[(Boolean, Boolean)], k=TypeRef, s=class Tuple2 +x=(1,2), t=TypeTag[(Int, Int)], k=TypeRef, s=class Tuple2 +x=(abc,xyz), t=TypeTag[(java.lang.String, java.lang.String)], k=TypeRef, s=class Tuple2 +x=('abc,'xyz), t=TypeTag[(Symbol, Symbol)], k=TypeRef, s=class Tuple2 + +x=Test$, t=TypeTag[Test.type], k=SingleType, s=object Test +x=scala.collection.immutable.List$, t=TypeTag[scala.collection.immutable.List.type], k=SingleType, s=object List + +x=Foo, t=TypeTag[Foo[Int]], k=TypeRef, s=class Foo +x=Foo, t=TypeTag[Foo[List[Int]]], k=TypeRef, s=class Foo +x=Foo, t=TypeTag[Foo[Foo[Int]]], k=TypeRef, s=class Foo +x=Foo, t=TypeTag[Foo[List[Foo[Int]]]], k=TypeRef, s=class Foo + +x=Test1$$anon$1, t=TypeTag[Bar[String]], k=RefinedType, s= +x=Test1$$anon$2, t=TypeTag[Bar[String]], k=RefinedType, s= + +()=() +true=true +a=a +1=1 +'abc='abc + +List(())=List(()) +List(true)=List(true) +List('abc)=List('abc) + +Array()=Array() +Array(true)=Array(true) +Array(a)=Array(a) +Array(1)=Array(1) + +((),())=((),()) +(true,false)=(true,false) + +List(List(1), List(2))=List(List(1), List(2)) + +Array(Array(1), Array(2))=Array(Array(1), Array(2)) + diff --git a/test/files/jvm/mkLibNatives.bat b/test/files/jvm/mkLibNatives.bat index 2f99f7aab5..623039b867 100755 --- a/test/files/jvm/mkLibNatives.bat +++ b/test/files/jvm/mkLibNatives.bat @@ -1,70 +1,70 @@ -@echo off - -rem ########################################################################## -rem # Author : Stephane Micheloud -rem ########################################################################## - -rem # For building the -64.dll, you need: Visual C++ Express, Microsoft SDK (to -rem # get the 64bit compiler / libraries), adapt this script. - -rem ########################################################################## -rem # variables - -if "%OS%"=="Windows_NT" @setlocal - -rem debug switches are: off=0, on=1 -set DEBUG=0 -set STDOUT=NUL -if %DEBUG%==1 set STDOUT=CON - -set CLASS_NAME=Test$ -set CLASS_DIR=. - -set OBJ_NAME=natives -set LIB_NAME=natives-32 - -if "%JAVA_HOME%"=="" goto error1 -if "%VSINSTALLDIR%"=="" goto error2 - -set JAVAH=%JAVA_HOME%\bin\javah -set JAVAH_OPTIONS=-jni -force -classpath %CLASS_DIR% -o %OBJ_NAME%.h - -set CC=%VSINSTALLDIR%\vc\bin\cl -set CC_OPTIONS=/nologo /c -set CC_INCLUDES=-I%VSINSTALLDIR%\vc\include -I%JAVA_HOME%\include -I%JAVA_HOME%\include\win32 - -set LNK_OPTIONS=/nologo /MT /LD - -rem variable LIB is used by the C++ linker to find libcmt.lib, .. -set LIB=%VSINSTALLDIR%\vc\lib - -rem ########################################################################## -rem # commands - -del /s/q *.obj *.exp *.lib *.dll 1>%STDOUT% - -if %DEBUG%==1 echo %JAVAH% %JAVAH_OPTIONS% %CLASS_NAME% -%JAVAH% %JAVAH_OPTIONS% %CLASS_NAME% - -if %DEBUG%==1 echo %CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c -%CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c 1>%STDOUT% - -if %DEBUG%==1 echo %CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj -%CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj 1>%STDOUT% - -goto end - -rem ########################################################################## -rem # subroutines - -:error1 -echo ERROR: environment variable JAVA_HOME is undefined. It should point to your JDK installation. -goto end - -:error2 -echo ERROR: environment variable VSINSTALLDIR is undefined. It should point to your MS Visual Studio installation. -goto end - -:end -if "%OS%"=="Windows_NT" @endlocal -exit /b %errorlevel% +@echo off + +rem ########################################################################## +rem # Author : Stephane Micheloud +rem ########################################################################## + +rem # For building the -64.dll, you need: Visual C++ Express, Microsoft SDK (to +rem # get the 64bit compiler / libraries), adapt this script. + +rem ########################################################################## +rem # variables + +if "%OS%"=="Windows_NT" @setlocal + +rem debug switches are: off=0, on=1 +set DEBUG=0 +set STDOUT=NUL +if %DEBUG%==1 set STDOUT=CON + +set CLASS_NAME=Test$ +set CLASS_DIR=. + +set OBJ_NAME=natives +set LIB_NAME=natives-32 + +if "%JAVA_HOME%"=="" goto error1 +if "%VSINSTALLDIR%"=="" goto error2 + +set JAVAH=%JAVA_HOME%\bin\javah +set JAVAH_OPTIONS=-jni -force -classpath %CLASS_DIR% -o %OBJ_NAME%.h + +set CC=%VSINSTALLDIR%\vc\bin\cl +set CC_OPTIONS=/nologo /c +set CC_INCLUDES=-I%VSINSTALLDIR%\vc\include -I%JAVA_HOME%\include -I%JAVA_HOME%\include\win32 + +set LNK_OPTIONS=/nologo /MT /LD + +rem variable LIB is used by the C++ linker to find libcmt.lib, .. +set LIB=%VSINSTALLDIR%\vc\lib + +rem ########################################################################## +rem # commands + +del /s/q *.obj *.exp *.lib *.dll 1>%STDOUT% + +if %DEBUG%==1 echo %JAVAH% %JAVAH_OPTIONS% %CLASS_NAME% +%JAVAH% %JAVAH_OPTIONS% %CLASS_NAME% + +if %DEBUG%==1 echo %CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c +%CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c 1>%STDOUT% + +if %DEBUG%==1 echo %CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj +%CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj 1>%STDOUT% + +goto end + +rem ########################################################################## +rem # subroutines + +:error1 +echo ERROR: environment variable JAVA_HOME is undefined. It should point to your JDK installation. +goto end + +:error2 +echo ERROR: environment variable VSINSTALLDIR is undefined. It should point to your MS Visual Studio installation. +goto end + +:end +if "%OS%"=="Windows_NT" @endlocal +exit /b %errorlevel% diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index 23af94180a..d785179a56 100644 --- a/test/files/neg/checksensible.check +++ b/test/files/neg/checksensible.check @@ -1,100 +1,100 @@ -checksensible.scala:13: error: comparing a fresh object using `eq' will always yield false - (new AnyRef) eq (new AnyRef) - ^ -checksensible.scala:14: error: comparing a fresh object using `ne' will always yield true - (new AnyRef) ne (new AnyRef) - ^ -checksensible.scala:15: error: comparing a fresh object using `eq' will always yield false - Shmoopie eq (new AnyRef) - ^ -checksensible.scala:16: error: comparing a fresh object using `eq' will always yield false - (Shmoopie: AnyRef) eq (new AnyRef) - ^ -checksensible.scala:17: error: comparing a fresh object using `eq' will always yield false - (new AnyRef) eq Shmoopie - ^ -checksensible.scala:18: error: comparing a fresh object using `eq' will always yield false - (new AnyRef) eq null - ^ -checksensible.scala:19: error: comparing a fresh object using `eq' will always yield false - null eq new AnyRef - ^ -checksensible.scala:26: error: comparing values of types Unit and Int using `==' will always yield false - (c = 1) == 0 - ^ -checksensible.scala:27: error: comparing values of types Int and Unit using `==' will always yield false - 0 == (c = 1) - ^ -checksensible.scala:29: error: comparing values of types Int and String using `==' will always yield false - 1 == "abc" - ^ -checksensible.scala:33: error: comparing values of types Some[Int] and Int using `==' will always yield false - Some(1) == 1 // as above - ^ -checksensible.scala:38: error: comparing a fresh object using `==' will always yield false - new AnyRef == 1 - ^ -checksensible.scala:41: error: comparing values of types Int and Boolean using `==' will always yield false - 1 == (new java.lang.Boolean(true)) - ^ -checksensible.scala:43: error: comparing values of types Int and Boolean using `!=' will always yield true - 1 != true - ^ -checksensible.scala:44: error: comparing values of types Unit and Boolean using `==' will always yield false - () == true - ^ -checksensible.scala:45: error: comparing values of types Unit and Unit using `==' will always yield true - () == () - ^ -checksensible.scala:46: error: comparing values of types Unit and Unit using `==' will always yield true - () == println - ^ -checksensible.scala:47: error: comparing values of types Unit and scala.runtime.BoxedUnit using `==' will always yield true - () == scala.runtime.BoxedUnit.UNIT // these should warn for always being true/false - ^ -checksensible.scala:48: error: comparing values of types scala.runtime.BoxedUnit and Unit using `!=' will always yield false - scala.runtime.BoxedUnit.UNIT != () - ^ -checksensible.scala:51: error: comparing values of types Int and Unit using `!=' will always yield true - (1 != println) - ^ -checksensible.scala:52: error: comparing values of types Int and Symbol using `!=' will always yield true - (1 != 'sym) - ^ -checksensible.scala:58: error: comparing a fresh object using `==' will always yield false - ((x: Int) => x + 1) == null - ^ -checksensible.scala:59: error: comparing a fresh object using `==' will always yield false - Bep == ((_: Int) + 1) - ^ -checksensible.scala:61: error: comparing a fresh object using `==' will always yield false - new Object == new Object - ^ -checksensible.scala:62: error: comparing a fresh object using `==' will always yield false - new Object == "abc" - ^ -checksensible.scala:63: error: comparing a fresh object using `!=' will always yield true - new Exception() != new Exception() - ^ -checksensible.scala:66: error: comparing values of types Int and Null using `==' will always yield false - if (foo.length == null) "plante" else "plante pas" - ^ -checksensible.scala:71: error: comparing values of types Bip and Bop using `==' will always yield false - (x1 == x2) - ^ -checksensible.scala:81: error: comparing values of types EqEqRefTest.this.C3 and EqEqRefTest.this.Z1 using `==' will always yield false - c3 == z1 - ^ -checksensible.scala:82: error: comparing values of types EqEqRefTest.this.Z1 and EqEqRefTest.this.C3 using `==' will always yield false - z1 == c3 - ^ -checksensible.scala:83: error: comparing values of types EqEqRefTest.this.Z1 and EqEqRefTest.this.C3 using `!=' will always yield true - z1 != c3 - ^ -checksensible.scala:84: error: comparing values of types EqEqRefTest.this.C3 and String using `!=' will always yield true - c3 != "abc" - ^ -checksensible.scala:95: error: comparing values of types Unit and Int using `!=' will always yield true - while ((c = in.read) != -1) - ^ -33 errors found +checksensible.scala:13: error: comparing a fresh object using `eq' will always yield false + (new AnyRef) eq (new AnyRef) + ^ +checksensible.scala:14: error: comparing a fresh object using `ne' will always yield true + (new AnyRef) ne (new AnyRef) + ^ +checksensible.scala:15: error: comparing a fresh object using `eq' will always yield false + Shmoopie eq (new AnyRef) + ^ +checksensible.scala:16: error: comparing a fresh object using `eq' will always yield false + (Shmoopie: AnyRef) eq (new AnyRef) + ^ +checksensible.scala:17: error: comparing a fresh object using `eq' will always yield false + (new AnyRef) eq Shmoopie + ^ +checksensible.scala:18: error: comparing a fresh object using `eq' will always yield false + (new AnyRef) eq null + ^ +checksensible.scala:19: error: comparing a fresh object using `eq' will always yield false + null eq new AnyRef + ^ +checksensible.scala:26: error: comparing values of types Unit and Int using `==' will always yield false + (c = 1) == 0 + ^ +checksensible.scala:27: error: comparing values of types Int and Unit using `==' will always yield false + 0 == (c = 1) + ^ +checksensible.scala:29: error: comparing values of types Int and String using `==' will always yield false + 1 == "abc" + ^ +checksensible.scala:33: error: comparing values of types Some[Int] and Int using `==' will always yield false + Some(1) == 1 // as above + ^ +checksensible.scala:38: error: comparing a fresh object using `==' will always yield false + new AnyRef == 1 + ^ +checksensible.scala:41: error: comparing values of types Int and Boolean using `==' will always yield false + 1 == (new java.lang.Boolean(true)) + ^ +checksensible.scala:43: error: comparing values of types Int and Boolean using `!=' will always yield true + 1 != true + ^ +checksensible.scala:44: error: comparing values of types Unit and Boolean using `==' will always yield false + () == true + ^ +checksensible.scala:45: error: comparing values of types Unit and Unit using `==' will always yield true + () == () + ^ +checksensible.scala:46: error: comparing values of types Unit and Unit using `==' will always yield true + () == println + ^ +checksensible.scala:47: error: comparing values of types Unit and scala.runtime.BoxedUnit using `==' will always yield true + () == scala.runtime.BoxedUnit.UNIT // these should warn for always being true/false + ^ +checksensible.scala:48: error: comparing values of types scala.runtime.BoxedUnit and Unit using `!=' will always yield false + scala.runtime.BoxedUnit.UNIT != () + ^ +checksensible.scala:51: error: comparing values of types Int and Unit using `!=' will always yield true + (1 != println) + ^ +checksensible.scala:52: error: comparing values of types Int and Symbol using `!=' will always yield true + (1 != 'sym) + ^ +checksensible.scala:58: error: comparing a fresh object using `==' will always yield false + ((x: Int) => x + 1) == null + ^ +checksensible.scala:59: error: comparing a fresh object using `==' will always yield false + Bep == ((_: Int) + 1) + ^ +checksensible.scala:61: error: comparing a fresh object using `==' will always yield false + new Object == new Object + ^ +checksensible.scala:62: error: comparing a fresh object using `==' will always yield false + new Object == "abc" + ^ +checksensible.scala:63: error: comparing a fresh object using `!=' will always yield true + new Exception() != new Exception() + ^ +checksensible.scala:66: error: comparing values of types Int and Null using `==' will always yield false + if (foo.length == null) "plante" else "plante pas" + ^ +checksensible.scala:71: error: comparing values of types Bip and Bop using `==' will always yield false + (x1 == x2) + ^ +checksensible.scala:81: error: comparing values of types EqEqRefTest.this.C3 and EqEqRefTest.this.Z1 using `==' will always yield false + c3 == z1 + ^ +checksensible.scala:82: error: comparing values of types EqEqRefTest.this.Z1 and EqEqRefTest.this.C3 using `==' will always yield false + z1 == c3 + ^ +checksensible.scala:83: error: comparing values of types EqEqRefTest.this.Z1 and EqEqRefTest.this.C3 using `!=' will always yield true + z1 != c3 + ^ +checksensible.scala:84: error: comparing values of types EqEqRefTest.this.C3 and String using `!=' will always yield true + c3 != "abc" + ^ +checksensible.scala:95: error: comparing values of types Unit and Int using `!=' will always yield true + while ((c = in.read) != -1) + ^ +33 errors found diff --git a/test/files/neg/classmanifests_new_deprecations.check b/test/files/neg/classmanifests_new_deprecations.check index 841e893249..e10308a66f 100644 --- a/test/files/neg/classmanifests_new_deprecations.check +++ b/test/files/neg/classmanifests_new_deprecations.check @@ -1,61 +1,61 @@ -classmanifests_new_deprecations.scala:2: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead - def cm1[T: ClassManifest] = ??? - ^ -classmanifests_new_deprecations.scala:3: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead - def cm2[T](implicit evidence$1: ClassManifest[T]) = ??? - ^ -classmanifests_new_deprecations.scala:4: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead - val cm3: ClassManifest[Int] = null - ^ -classmanifests_new_deprecations.scala:4: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead - val cm3: ClassManifest[Int] = null - ^ -classmanifests_new_deprecations.scala:6: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead - def rcm1[T: scala.reflect.ClassManifest] = ??? - ^ -classmanifests_new_deprecations.scala:7: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead - def rcm2[T](implicit evidence$1: scala.reflect.ClassManifest[T]) = ??? - ^ -classmanifests_new_deprecations.scala:8: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead - val rcm3: scala.reflect.ClassManifest[Int] = null - ^ -classmanifests_new_deprecations.scala:8: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead - val rcm3: scala.reflect.ClassManifest[Int] = null - ^ -classmanifests_new_deprecations.scala:10: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead - type CM[T] = ClassManifest[T] - ^ -classmanifests_new_deprecations.scala:15: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead - type RCM[T] = scala.reflect.ClassManifest[T] - ^ -classmanifests_new_deprecations.scala:20: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - def m1[T: Manifest] = ??? - ^ -classmanifests_new_deprecations.scala:21: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - def m2[T](implicit evidence$1: Manifest[T]) = ??? - ^ -classmanifests_new_deprecations.scala:22: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - val m3: Manifest[Int] = null - ^ -classmanifests_new_deprecations.scala:22: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - val m3: Manifest[Int] = null - ^ -classmanifests_new_deprecations.scala:24: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - def rm1[T: scala.reflect.Manifest] = ??? - ^ -classmanifests_new_deprecations.scala:25: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - def rm2[T](implicit evidence$1: scala.reflect.Manifest[T]) = ??? - ^ -classmanifests_new_deprecations.scala:26: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - val rm3: scala.reflect.Manifest[Int] = null - ^ -classmanifests_new_deprecations.scala:26: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - val rm3: scala.reflect.Manifest[Int] = null - ^ -classmanifests_new_deprecations.scala:28: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - type M[T] = Manifest[T] - ^ -classmanifests_new_deprecations.scala:33: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - type RM[T] = scala.reflect.Manifest[T] - ^ -20 errors found +classmanifests_new_deprecations.scala:2: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead + def cm1[T: ClassManifest] = ??? + ^ +classmanifests_new_deprecations.scala:3: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead + def cm2[T](implicit evidence$1: ClassManifest[T]) = ??? + ^ +classmanifests_new_deprecations.scala:4: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead + val cm3: ClassManifest[Int] = null + ^ +classmanifests_new_deprecations.scala:4: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead + val cm3: ClassManifest[Int] = null + ^ +classmanifests_new_deprecations.scala:6: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead + def rcm1[T: scala.reflect.ClassManifest] = ??? + ^ +classmanifests_new_deprecations.scala:7: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead + def rcm2[T](implicit evidence$1: scala.reflect.ClassManifest[T]) = ??? + ^ +classmanifests_new_deprecations.scala:8: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead + val rcm3: scala.reflect.ClassManifest[Int] = null + ^ +classmanifests_new_deprecations.scala:8: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead + val rcm3: scala.reflect.ClassManifest[Int] = null + ^ +classmanifests_new_deprecations.scala:10: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead + type CM[T] = ClassManifest[T] + ^ +classmanifests_new_deprecations.scala:15: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead + type RCM[T] = scala.reflect.ClassManifest[T] + ^ +classmanifests_new_deprecations.scala:20: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + def m1[T: Manifest] = ??? + ^ +classmanifests_new_deprecations.scala:21: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + def m2[T](implicit evidence$1: Manifest[T]) = ??? + ^ +classmanifests_new_deprecations.scala:22: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + val m3: Manifest[Int] = null + ^ +classmanifests_new_deprecations.scala:22: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + val m3: Manifest[Int] = null + ^ +classmanifests_new_deprecations.scala:24: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + def rm1[T: scala.reflect.Manifest] = ??? + ^ +classmanifests_new_deprecations.scala:25: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + def rm2[T](implicit evidence$1: scala.reflect.Manifest[T]) = ??? + ^ +classmanifests_new_deprecations.scala:26: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + val rm3: scala.reflect.Manifest[Int] = null + ^ +classmanifests_new_deprecations.scala:26: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + val rm3: scala.reflect.Manifest[Int] = null + ^ +classmanifests_new_deprecations.scala:28: error: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + type M[T] = Manifest[T] + ^ +classmanifests_new_deprecations.scala:33: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead + type RM[T] = scala.reflect.Manifest[T] + ^ +20 errors found diff --git a/test/files/neg/classtags_contextbound_a.check b/test/files/neg/classtags_contextbound_a.check index f4b6ff5af1..5edb7f9a5a 100644 --- a/test/files/neg/classtags_contextbound_a.check +++ b/test/files/neg/classtags_contextbound_a.check @@ -1,4 +1,4 @@ -classtags_contextbound_a.scala:2: error: No ClassTag available for T - def foo[T] = Array[T]() - ^ -one error found +classtags_contextbound_a.scala:2: error: No ClassTag available for T + def foo[T] = Array[T]() + ^ +one error found diff --git a/test/files/neg/classtags_contextbound_b.check b/test/files/neg/classtags_contextbound_b.check index e08ab504bc..e17ab8b0d1 100644 --- a/test/files/neg/classtags_contextbound_b.check +++ b/test/files/neg/classtags_contextbound_b.check @@ -1,4 +1,4 @@ -classtags_contextbound_b.scala:5: error: No ClassTag available for T - def foo[T] = mkArray[T] - ^ -one error found +classtags_contextbound_b.scala:5: error: No ClassTag available for T + def foo[T] = mkArray[T] + ^ +one error found diff --git a/test/files/neg/classtags_contextbound_c.check b/test/files/neg/classtags_contextbound_c.check index f8768eea2b..e8666f7a10 100644 --- a/test/files/neg/classtags_contextbound_c.check +++ b/test/files/neg/classtags_contextbound_c.check @@ -1,4 +1,4 @@ -classtags_contextbound_c.scala:4: error: No ClassTag available for T - def mkArray[T] = Array[T]() - ^ -one error found +classtags_contextbound_c.scala:4: error: No ClassTag available for T + def mkArray[T] = Array[T]() + ^ +one error found diff --git a/test/files/neg/classtags_dont_use_typetags.check b/test/files/neg/classtags_dont_use_typetags.check index 24585e7c3f..4f728d267d 100644 --- a/test/files/neg/classtags_dont_use_typetags.check +++ b/test/files/neg/classtags_dont_use_typetags.check @@ -1,4 +1,4 @@ -classtags_dont_use_typetags.scala:4: error: No ClassTag available for T - def foo[T: TypeTag] = Array[T]() - ^ -one error found +classtags_dont_use_typetags.scala:4: error: No ClassTag available for T + def foo[T: TypeTag] = Array[T]() + ^ +one error found diff --git a/test/files/neg/interop_abstypetags_arenot_classmanifests.check b/test/files/neg/interop_abstypetags_arenot_classmanifests.check index 15bdcfc5b1..d15e33346c 100644 --- a/test/files/neg/interop_abstypetags_arenot_classmanifests.check +++ b/test/files/neg/interop_abstypetags_arenot_classmanifests.check @@ -1,4 +1,4 @@ -interop_abstypetags_arenot_classmanifests.scala:5: error: No ClassManifest available for T. - println(classManifest[T]) - ^ -one error found +interop_abstypetags_arenot_classmanifests.scala:5: error: No ClassManifest available for T. + println(classManifest[T]) + ^ +one error found diff --git a/test/files/neg/interop_abstypetags_arenot_classtags.check b/test/files/neg/interop_abstypetags_arenot_classtags.check index 637db83e57..3aa7a50b50 100644 --- a/test/files/neg/interop_abstypetags_arenot_classtags.check +++ b/test/files/neg/interop_abstypetags_arenot_classtags.check @@ -1,4 +1,4 @@ -interop_abstypetags_arenot_classtags.scala:6: error: No ClassTag available for T - println(classTag[T]) - ^ -one error found +interop_abstypetags_arenot_classtags.scala:6: error: No ClassTag available for T + println(classTag[T]) + ^ +one error found diff --git a/test/files/neg/interop_abstypetags_arenot_manifests.check b/test/files/neg/interop_abstypetags_arenot_manifests.check index c80635543f..5916b68742 100644 --- a/test/files/neg/interop_abstypetags_arenot_manifests.check +++ b/test/files/neg/interop_abstypetags_arenot_manifests.check @@ -1,4 +1,4 @@ -interop_abstypetags_arenot_manifests.scala:5: error: No Manifest available for T. - println(manifest[T]) - ^ -one error found +interop_abstypetags_arenot_manifests.scala:5: error: No Manifest available for T. + println(manifest[T]) + ^ +one error found diff --git a/test/files/neg/interop_classmanifests_arenot_typetags.check b/test/files/neg/interop_classmanifests_arenot_typetags.check index 6675fd9eae..db8e57981a 100644 --- a/test/files/neg/interop_classmanifests_arenot_typetags.check +++ b/test/files/neg/interop_classmanifests_arenot_typetags.check @@ -1,4 +1,4 @@ -interop_classmanifests_arenot_typetags.scala:5: error: No TypeTag available for T - println(implicitly[TypeTag[T]]) - ^ -one error found +interop_classmanifests_arenot_typetags.scala:5: error: No TypeTag available for T + println(implicitly[TypeTag[T]]) + ^ +one error found diff --git a/test/files/neg/interop_classtags_arenot_manifests.check b/test/files/neg/interop_classtags_arenot_manifests.check index 6982f0b805..fa805b5918 100644 --- a/test/files/neg/interop_classtags_arenot_manifests.check +++ b/test/files/neg/interop_classtags_arenot_manifests.check @@ -1,4 +1,4 @@ -interop_classtags_arenot_manifests.scala:5: error: No Manifest available for T. - println(manifest[T]) - ^ -one error found +interop_classtags_arenot_manifests.scala:5: error: No Manifest available for T. + println(manifest[T]) + ^ +one error found diff --git a/test/files/neg/interop_typetags_arenot_classmanifests.check b/test/files/neg/interop_typetags_arenot_classmanifests.check index b404f94d69..88fb1647e5 100644 --- a/test/files/neg/interop_typetags_arenot_classmanifests.check +++ b/test/files/neg/interop_typetags_arenot_classmanifests.check @@ -1,4 +1,4 @@ -interop_typetags_arenot_classmanifests.scala:5: error: No ClassManifest available for T. - println(classManifest[T]) - ^ -one error found +interop_typetags_arenot_classmanifests.scala:5: error: No ClassManifest available for T. + println(classManifest[T]) + ^ +one error found diff --git a/test/files/neg/interop_typetags_arenot_classtags.check b/test/files/neg/interop_typetags_arenot_classtags.check index 673ad2f941..1d1fb15f9e 100644 --- a/test/files/neg/interop_typetags_arenot_classtags.check +++ b/test/files/neg/interop_typetags_arenot_classtags.check @@ -1,4 +1,4 @@ -interop_typetags_arenot_classtags.scala:6: error: No ClassTag available for T - println(classTag[T]) - ^ -one error found +interop_typetags_arenot_classtags.scala:6: error: No ClassTag available for T + println(classTag[T]) + ^ +one error found diff --git a/test/files/neg/interop_typetags_without_classtags_arenot_manifests.check b/test/files/neg/interop_typetags_without_classtags_arenot_manifests.check index a95f1ad308..ba744a8837 100644 --- a/test/files/neg/interop_typetags_without_classtags_arenot_manifests.check +++ b/test/files/neg/interop_typetags_without_classtags_arenot_manifests.check @@ -1,6 +1,6 @@ -interop_typetags_without_classtags_arenot_manifests.scala:6: error: to create a manifest here, it is necessary to interoperate with the type tag `evidence$1` in scope. -however typetag -> manifest conversion requires a class tag for the corresponding type to be present. -to proceed add a class tag to the type `T` (e.g. by introducing a context bound) and recompile. - println(manifest[T]) - ^ -one error found +interop_typetags_without_classtags_arenot_manifests.scala:6: error: to create a manifest here, it is necessary to interoperate with the type tag `evidence$1` in scope. +however typetag -> manifest conversion requires a class tag for the corresponding type to be present. +to proceed add a class tag to the type `T` (e.g. by introducing a context bound) and recompile. + println(manifest[T]) + ^ +one error found diff --git a/test/files/neg/macro-basic-mamdmi.check b/test/files/neg/macro-basic-mamdmi.check index 67b00c0ec5..c7b58d70d2 100644 --- a/test/files/neg/macro-basic-mamdmi.check +++ b/test/files/neg/macro-basic-mamdmi.check @@ -1,4 +1,4 @@ -Impls_Macros_Test_1.scala:36: error: macro implementation not found: foo (the most common reason for that is that you cannot use macro implementations in the same compilation run that defines them) - println(foo(2) + Macros.bar(2) * new Macros().quux(4)) - ^ -one error found +Impls_Macros_Test_1.scala:36: error: macro implementation not found: foo (the most common reason for that is that you cannot use macro implementations in the same compilation run that defines them) + println(foo(2) + Macros.bar(2) * new Macros().quux(4)) + ^ +one error found diff --git a/test/files/neg/macro-deprecate-idents.check b/test/files/neg/macro-deprecate-idents.check index f8a7e519df..22b667c390 100644 --- a/test/files/neg/macro-deprecate-idents.check +++ b/test/files/neg/macro-deprecate-idents.check @@ -1,52 +1,52 @@ -macro-deprecate-idents.scala:2: error: macro is now a reserved word; usage as an identifier is deprecated - val macro = ??? - ^ -macro-deprecate-idents.scala:6: error: macro is now a reserved word; usage as an identifier is deprecated - var macro = ??? - ^ -macro-deprecate-idents.scala:10: error: macro is now a reserved word; usage as an identifier is deprecated - type macro = Int - ^ -macro-deprecate-idents.scala:14: error: macro is now a reserved word; usage as an identifier is deprecated - class macro - ^ -macro-deprecate-idents.scala:18: error: macro is now a reserved word; usage as an identifier is deprecated - class macro - ^ -macro-deprecate-idents.scala:22: error: macro is now a reserved word; usage as an identifier is deprecated - object macro - ^ -macro-deprecate-idents.scala:26: error: macro is now a reserved word; usage as an identifier is deprecated - object macro - ^ -macro-deprecate-idents.scala:30: error: macro is now a reserved word; usage as an identifier is deprecated - trait macro - ^ -macro-deprecate-idents.scala:34: error: macro is now a reserved word; usage as an identifier is deprecated - trait macro - ^ -macro-deprecate-idents.scala:37: error: macro is now a reserved word; usage as an identifier is deprecated -package macro { - ^ -macro-deprecate-idents.scala:38: error: macro is now a reserved word; usage as an identifier is deprecated - package macro.bar { - ^ -macro-deprecate-idents.scala:43: error: macro is now a reserved word; usage as an identifier is deprecated - package macro.foo { - ^ -macro-deprecate-idents.scala:48: error: macro is now a reserved word; usage as an identifier is deprecated - val Some(macro) = Some(42) - ^ -macro-deprecate-idents.scala:49: error: macro is now a reserved word; usage as an identifier is deprecated - macro match { - ^ -macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated - case macro => println(macro) - ^ -macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated - case macro => println(macro) - ^ -macro-deprecate-idents.scala:55: error: macro is now a reserved word; usage as an identifier is deprecated - def macro = 2 - ^ -17 errors found +macro-deprecate-idents.scala:2: error: macro is now a reserved word; usage as an identifier is deprecated + val macro = ??? + ^ +macro-deprecate-idents.scala:6: error: macro is now a reserved word; usage as an identifier is deprecated + var macro = ??? + ^ +macro-deprecate-idents.scala:10: error: macro is now a reserved word; usage as an identifier is deprecated + type macro = Int + ^ +macro-deprecate-idents.scala:14: error: macro is now a reserved word; usage as an identifier is deprecated + class macro + ^ +macro-deprecate-idents.scala:18: error: macro is now a reserved word; usage as an identifier is deprecated + class macro + ^ +macro-deprecate-idents.scala:22: error: macro is now a reserved word; usage as an identifier is deprecated + object macro + ^ +macro-deprecate-idents.scala:26: error: macro is now a reserved word; usage as an identifier is deprecated + object macro + ^ +macro-deprecate-idents.scala:30: error: macro is now a reserved word; usage as an identifier is deprecated + trait macro + ^ +macro-deprecate-idents.scala:34: error: macro is now a reserved word; usage as an identifier is deprecated + trait macro + ^ +macro-deprecate-idents.scala:37: error: macro is now a reserved word; usage as an identifier is deprecated +package macro { + ^ +macro-deprecate-idents.scala:38: error: macro is now a reserved word; usage as an identifier is deprecated + package macro.bar { + ^ +macro-deprecate-idents.scala:43: error: macro is now a reserved word; usage as an identifier is deprecated + package macro.foo { + ^ +macro-deprecate-idents.scala:48: error: macro is now a reserved word; usage as an identifier is deprecated + val Some(macro) = Some(42) + ^ +macro-deprecate-idents.scala:49: error: macro is now a reserved word; usage as an identifier is deprecated + macro match { + ^ +macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated + case macro => println(macro) + ^ +macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated + case macro => println(macro) + ^ +macro-deprecate-idents.scala:55: error: macro is now a reserved word; usage as an identifier is deprecated + def macro = 2 + ^ +17 errors found diff --git a/test/files/neg/macro-invalidimpl-a.check b/test/files/neg/macro-invalidimpl-a.check index 855fe2d169..7f11f3b865 100644 --- a/test/files/neg/macro-invalidimpl-a.check +++ b/test/files/neg/macro-invalidimpl-a.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:3: error: macro implementation must be in statically accessible object - def foo(x: Any) = macro impls.foo - ^ -one error found +Macros_Test_2.scala:3: error: macro implementation must be in statically accessible object + def foo(x: Any) = macro impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-b.check b/test/files/neg/macro-invalidimpl-b.check index 855fe2d169..7f11f3b865 100644 --- a/test/files/neg/macro-invalidimpl-b.check +++ b/test/files/neg/macro-invalidimpl-b.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:3: error: macro implementation must be in statically accessible object - def foo(x: Any) = macro impls.foo - ^ -one error found +Macros_Test_2.scala:3: error: macro implementation must be in statically accessible object + def foo(x: Any) = macro impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-c.check b/test/files/neg/macro-invalidimpl-c.check index 722ec3c7bd..9e0181c0a3 100644 --- a/test/files/neg/macro-invalidimpl-c.check +++ b/test/files/neg/macro-invalidimpl-c.check @@ -1,4 +1,4 @@ -Impls_Macros_1.scala:8: error: macro implementation must be in statically accessible object - def foo(x: Any) = macro Impls.foo - ^ -one error found +Impls_Macros_1.scala:8: error: macro implementation must be in statically accessible object + def foo(x: Any) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-d.check b/test/files/neg/macro-invalidimpl-d.check index 6fedfa74fc..76a5ba9c8c 100644 --- a/test/files/neg/macro-invalidimpl-d.check +++ b/test/files/neg/macro-invalidimpl-d.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:2: error: macro implementation must be in statically accessible object - def foo(x: Any) = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation must be in statically accessible object + def foo(x: Any) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-e.check b/test/files/neg/macro-invalidimpl-e.check index 5cfcf85625..e0910b2899 100644 --- a/test/files/neg/macro-invalidimpl-e.check +++ b/test/files/neg/macro-invalidimpl-e.check @@ -1,13 +1,13 @@ -Macros_Test_2.scala:2: error: ambiguous reference to overloaded definition, -both method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any], y: c.Expr[Any])Nothing -and method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any])Nothing -match expected type ? - def foo(x: Any) = macro Impls.foo - ^ -Macros_Test_2.scala:3: error: ambiguous reference to overloaded definition, -both method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any], y: c.Expr[Any])Nothing -and method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any])Nothing -match expected type ? - def foo(x: Any, y: Any) = macro Impls.foo - ^ -two errors found +Macros_Test_2.scala:2: error: ambiguous reference to overloaded definition, +both method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any], y: c.Expr[Any])Nothing +and method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any])Nothing +match expected type ? + def foo(x: Any) = macro Impls.foo + ^ +Macros_Test_2.scala:3: error: ambiguous reference to overloaded definition, +both method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any], y: c.Expr[Any])Nothing +and method foo in object Impls of type (c: scala.reflect.macros.Context)(x: c.Expr[Any])Nothing +match expected type ? + def foo(x: Any, y: Any) = macro Impls.foo + ^ +two errors found diff --git a/test/files/neg/macro-invalidimpl-f.check b/test/files/neg/macro-invalidimpl-f.check index 14f1e25287..4e5851f566 100644 --- a/test/files/neg/macro-invalidimpl-f.check +++ b/test/files/neg/macro-invalidimpl-f.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(): c.Expr[Unit] - found : (c: scala.reflect.macros.Context): c.Expr[Unit] -number of parameter sections differ - def bar1() = macro Impls.fooNullary - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(): c.Expr[Unit] + found : (c: scala.reflect.macros.Context): c.Expr[Unit] +number of parameter sections differ + def bar1() = macro Impls.fooNullary + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-g.check b/test/files/neg/macro-invalidimpl-g.check index a886436d35..7342f7336f 100644 --- a/test/files/neg/macro-invalidimpl-g.check +++ b/test/files/neg/macro-invalidimpl-g.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Unit] - found : (c: scala.reflect.macros.Context)(): c.Expr[Unit] -number of parameter sections differ - def foo1 = macro Impls.fooEmpty - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Unit] + found : (c: scala.reflect.macros.Context)(): c.Expr[Unit] +number of parameter sections differ + def foo1 = macro Impls.fooEmpty + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-h.check b/test/files/neg/macro-invalidimpl-h.check index cc7fc794d3..ea76e1aeac 100644 --- a/test/files/neg/macro-invalidimpl-h.check +++ b/test/files/neg/macro-invalidimpl-h.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:2: error: type arguments [String] do not conform to method foo's type parameter bounds [U <: Int] - def foo = macro Impls.foo[String] - ^ -one error found +Macros_Test_2.scala:2: error: type arguments [String] do not conform to method foo's type parameter bounds [U <: Int] + def foo = macro Impls.foo[String] + ^ +one error found diff --git a/test/files/neg/macro-invalidimpl-i.check b/test/files/neg/macro-invalidimpl-i.check index b6277809a3..846ed8d134 100644 --- a/test/files/neg/macro-invalidimpl-i.check +++ b/test/files/neg/macro-invalidimpl-i.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:4: error: macro implementation must be public - def foo = macro Impls.impl - ^ -one error found +Macros_Test_2.scala:4: error: macro implementation must be public + def foo = macro Impls.impl + ^ +one error found diff --git a/test/files/neg/macro-invalidret-nontree.check b/test/files/neg/macro-invalidret-nontree.check index 78ab08df3e..6d8336d06d 100644 --- a/test/files/neg/macro-invalidret-nontree.check +++ b/test/files/neg/macro-invalidret-nontree.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : (c: scala.reflect.macros.Context): Int -type mismatch for return type: Int does not conform to c.Expr[Any] - def foo = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : (c: scala.reflect.macros.Context): Int +type mismatch for return type: Int does not conform to c.Expr[Any] + def foo = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidret-nonuniversetree.check b/test/files/neg/macro-invalidret-nonuniversetree.check index b3a4d0da80..089bfd0dc9 100644 --- a/test/files/neg/macro-invalidret-nonuniversetree.check +++ b/test/files/neg/macro-invalidret-nonuniversetree.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : (c: scala.reflect.macros.Context): reflect.runtime.universe.Literal -type mismatch for return type: reflect.runtime.universe.Literal does not conform to c.Expr[Any] - def foo = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : (c: scala.reflect.macros.Context): reflect.runtime.universe.Literal +type mismatch for return type: reflect.runtime.universe.Literal does not conform to c.Expr[Any] + def foo = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidshape-a.check b/test/files/neg/macro-invalidshape-a.check index 098ec35a00..f38a90819e 100644 --- a/test/files/neg/macro-invalidshape-a.check +++ b/test/files/neg/macro-invalidshape-a.check @@ -1,5 +1,5 @@ -Macros_Test_2.scala:2: error: macro body has wrong shape: - required: macro [].[[]] - def foo(x: Any) = macro 2 - ^ -one error found +Macros_Test_2.scala:2: error: macro body has wrong shape: + required: macro [].[[]] + def foo(x: Any) = macro 2 + ^ +one error found diff --git a/test/files/neg/macro-invalidshape-b.check b/test/files/neg/macro-invalidshape-b.check index 297ff69199..976685c6bd 100644 --- a/test/files/neg/macro-invalidshape-b.check +++ b/test/files/neg/macro-invalidshape-b.check @@ -1,5 +1,5 @@ -Macros_Test_2.scala:2: error: macro body has wrong shape: - required: macro [].[[]] - def foo(x: Any) = macro Impls.foo(null)(null) - ^ -one error found +Macros_Test_2.scala:2: error: macro body has wrong shape: + required: macro [].[[]] + def foo(x: Any) = macro Impls.foo(null)(null) + ^ +one error found diff --git a/test/files/neg/macro-invalidshape-c.check b/test/files/neg/macro-invalidshape-c.check index 6513df166e..0b2e9cfe4f 100644 --- a/test/files/neg/macro-invalidshape-c.check +++ b/test/files/neg/macro-invalidshape-c.check @@ -1,9 +1,9 @@ -Macros_Test_2.scala:2: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses - def foo(x: Any) = macro {2; Impls.foo} - ^ -Macros_Test_2.scala:2: error: missing arguments for method foo in object Impls; -follow this method with `_' if you want to treat it as a partially applied function - def foo(x: Any) = macro {2; Impls.foo} - ^ -one warning found -one error found +Macros_Test_2.scala:2: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses + def foo(x: Any) = macro {2; Impls.foo} + ^ +Macros_Test_2.scala:2: error: missing arguments for method foo in object Impls; +follow this method with `_' if you want to treat it as a partially applied function + def foo(x: Any) = macro {2; Impls.foo} + ^ +one warning found +one error found diff --git a/test/files/neg/macro-invalidshape-d.check b/test/files/neg/macro-invalidshape-d.check index f0d77e2f2d..e43a2ca0ab 100644 --- a/test/files/neg/macro-invalidshape-d.check +++ b/test/files/neg/macro-invalidshape-d.check @@ -1,8 +1,8 @@ -Macros_Test_2.scala:2: warning: macro is now a reserved word; usage as an identifier is deprecated - def foo(x: Any) = {2; macro Impls.foo} - ^ -Macros_Test_2.scala:2: error: ';' expected but '.' found. - def foo(x: Any) = {2; macro Impls.foo} - ^ -one warning found -one error found +Macros_Test_2.scala:2: warning: macro is now a reserved word; usage as an identifier is deprecated + def foo(x: Any) = {2; macro Impls.foo} + ^ +Macros_Test_2.scala:2: error: ';' expected but '.' found. + def foo(x: Any) = {2; macro Impls.foo} + ^ +one warning found +one error found diff --git a/test/files/neg/macro-invalidsig-context-bounds.check b/test/files/neg/macro-invalidsig-context-bounds.check index eb5d833bc0..43b8c23b35 100644 --- a/test/files/neg/macro-invalidsig-context-bounds.check +++ b/test/files/neg/macro-invalidsig-context-bounds.check @@ -1,7 +1,7 @@ -Macros_Test_1.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : (c: scala.reflect.macros.Context)(implicit evidence$2: Numeric[U]): c.universe.Literal -macro implementations cannot have implicit parameters other than WeakTypeTag evidences - def foo[U] = macro Impls.foo[U] - ^ -one error found +Macros_Test_1.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : (c: scala.reflect.macros.Context)(implicit evidence$2: Numeric[U]): c.universe.Literal +macro implementations cannot have implicit parameters other than WeakTypeTag evidences + def foo[U] = macro Impls.foo[U] + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-ctx-badargc.check b/test/files/neg/macro-invalidsig-ctx-badargc.check index 8a1ca6a8b1..1c14072a94 100644 --- a/test/files/neg/macro-invalidsig-ctx-badargc.check +++ b/test/files/neg/macro-invalidsig-ctx-badargc.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : : Nothing -number of parameter sections differ - def foo = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : : Nothing +number of parameter sections differ + def foo = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-ctx-badtype.check b/test/files/neg/macro-invalidsig-ctx-badtype.check index 9e57ab8631..340ace6a38 100644 --- a/test/files/neg/macro-invalidsig-ctx-badtype.check +++ b/test/files/neg/macro-invalidsig-ctx-badtype.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : (c: scala.reflect.api.Universe): Nothing -type mismatch for parameter c: scala.reflect.macros.Context does not conform to scala.reflect.api.Universe - def foo = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : (c: scala.reflect.api.Universe): Nothing +type mismatch for parameter c: scala.reflect.macros.Context does not conform to scala.reflect.api.Universe + def foo = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-ctx-badvarargs.check b/test/files/neg/macro-invalidsig-ctx-badvarargs.check index 37941a7dc9..a6478f03e3 100644 --- a/test/files/neg/macro-invalidsig-ctx-badvarargs.check +++ b/test/files/neg/macro-invalidsig-ctx-badvarargs.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : (cs: scala.reflect.macros.Context*): Nothing -types incompatible for parameter cs: corresponding is not a vararg parameter - def foo = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : (cs: scala.reflect.macros.Context*): Nothing +types incompatible for parameter cs: corresponding is not a vararg parameter + def foo = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-ctx-noctx.check b/test/files/neg/macro-invalidsig-ctx-noctx.check index 722fe9dfb6..b7dc9a449b 100644 --- a/test/files/neg/macro-invalidsig-ctx-noctx.check +++ b/test/files/neg/macro-invalidsig-ctx-noctx.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(x: c.Expr[Any]): c.Expr[Any] - found : (c: scala.reflect.macros.Context): Nothing -number of parameter sections differ - def foo(x: Any) = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(x: c.Expr[Any]): c.Expr[Any] + found : (c: scala.reflect.macros.Context): Nothing +number of parameter sections differ + def foo(x: Any) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-implicit-params.check b/test/files/neg/macro-invalidsig-implicit-params.check index ca35e62cd7..f210eb8a32 100644 --- a/test/files/neg/macro-invalidsig-implicit-params.check +++ b/test/files/neg/macro-invalidsig-implicit-params.check @@ -1,7 +1,7 @@ -Impls_Macros_1.scala:18: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(x: c.Expr[Int]): c.Expr[Unit] - found : (c: scala.reflect.macros.Context)(implicit x: c.Expr[Int]): c.Expr[Unit] -macro implementations cannot have implicit parameters other than WeakTypeTag evidences - def foo_targs[U](x: Int) = macro Impls.foo_targs[T, U] - ^ -one error found +Impls_Macros_1.scala:18: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(x: c.Expr[Int]): c.Expr[Unit] + found : (c: scala.reflect.macros.Context)(implicit x: c.Expr[Int]): c.Expr[Unit] +macro implementations cannot have implicit parameters other than WeakTypeTag evidences + def foo_targs[U](x: Int) = macro Impls.foo_targs[T, U] + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-params-badargc.check b/test/files/neg/macro-invalidsig-params-badargc.check index ab4fb535c5..3f6d815b8e 100644 --- a/test/files/neg/macro-invalidsig-params-badargc.check +++ b/test/files/neg/macro-invalidsig-params-badargc.check @@ -1,7 +1,7 @@ -Impls_Macros_1.scala:8: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(x: c.Expr[Int]): c.Expr[Any] - found : (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): Nothing -parameter lists have different length, found extra parameter y: c.Expr[Int] - def foo(x: Int) = macro Impls.foo - ^ -one error found +Impls_Macros_1.scala:8: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(x: c.Expr[Int]): c.Expr[Any] + found : (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): Nothing +parameter lists have different length, found extra parameter y: c.Expr[Int] + def foo(x: Int) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-params-badtype.check b/test/files/neg/macro-invalidsig-params-badtype.check index 007620a366..3ec40d7e5b 100644 --- a/test/files/neg/macro-invalidsig-params-badtype.check +++ b/test/files/neg/macro-invalidsig-params-badtype.check @@ -1,7 +1,7 @@ -Impls_Macros_1.scala:8: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(x: c.Expr[Int]): c.Expr[Any] - found : (c: scala.reflect.macros.Context)(x: c.universe.Tree): Nothing -type mismatch for parameter x: c.Expr[Int] does not conform to c.universe.Tree - def foo(x: Int) = macro Impls.foo - ^ -one error found +Impls_Macros_1.scala:8: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(x: c.Expr[Int]): c.Expr[Any] + found : (c: scala.reflect.macros.Context)(x: c.universe.Tree): Nothing +type mismatch for parameter x: c.Expr[Int] does not conform to c.universe.Tree + def foo(x: Int) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-params-badvarargs.check b/test/files/neg/macro-invalidsig-params-badvarargs.check index f0dcc24d03..50607ff52d 100644 --- a/test/files/neg/macro-invalidsig-params-badvarargs.check +++ b/test/files/neg/macro-invalidsig-params-badvarargs.check @@ -1,7 +1,7 @@ -Impls_Macros_1.scala:8: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): c.Expr[Any] - found : (c: scala.reflect.macros.Context)(xs: c.Expr[Int]*): Nothing -parameter lists have different length, required extra parameter y: c.Expr[Int] - def foo(x: Int, y: Int) = macro Impls.foo - ^ -one error found +Impls_Macros_1.scala:8: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): c.Expr[Any] + found : (c: scala.reflect.macros.Context)(xs: c.Expr[Int]*): Nothing +parameter lists have different length, required extra parameter y: c.Expr[Int] + def foo(x: Int, y: Int) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-params-namemismatch.check b/test/files/neg/macro-invalidsig-params-namemismatch.check index 00d781a2ac..4029bc8129 100644 --- a/test/files/neg/macro-invalidsig-params-namemismatch.check +++ b/test/files/neg/macro-invalidsig-params-namemismatch.check @@ -1,7 +1,7 @@ -Impls_Macros_1.scala:8: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): c.Expr[Any] - found : (c: scala.reflect.macros.Context)(y: c.Expr[Int], x: c.Expr[Int]): Nothing -parameter names differ: x != y - def foo(x: Int, y: Int) = macro Impls.foo - ^ -one error found +Impls_Macros_1.scala:8: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): c.Expr[Any] + found : (c: scala.reflect.macros.Context)(y: c.Expr[Int], x: c.Expr[Int]): Nothing +parameter names differ: x != y + def foo(x: Int, y: Int) = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-tparams-badtype.check b/test/files/neg/macro-invalidsig-tparams-badtype.check index 20c58ff2bb..e9f3547133 100644 --- a/test/files/neg/macro-invalidsig-tparams-badtype.check +++ b/test/files/neg/macro-invalidsig-tparams-badtype.check @@ -1,7 +1,7 @@ -Macros_Test_2.scala:2: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context): c.Expr[Any] - found : (c: scala.reflect.macros.Context)(U: c.universe.Type): Nothing -number of parameter sections differ - def foo[U] = macro Impls.foo[U] - ^ -one error found +Macros_Test_2.scala:2: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context): c.Expr[Any] + found : (c: scala.reflect.macros.Context)(U: c.universe.Type): Nothing +number of parameter sections differ + def foo[U] = macro Impls.foo[U] + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-tparams-bounds-a.check b/test/files/neg/macro-invalidsig-tparams-bounds-a.check index 6ba80b45c0..b6248a1c47 100644 --- a/test/files/neg/macro-invalidsig-tparams-bounds-a.check +++ b/test/files/neg/macro-invalidsig-tparams-bounds-a.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:2: error: type arguments [U] do not conform to method foo's type parameter bounds [U <: String] - def foo[U] = macro Impls.foo[U] - ^ -one error found +Macros_Test_2.scala:2: error: type arguments [U] do not conform to method foo's type parameter bounds [U <: String] + def foo[U] = macro Impls.foo[U] + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-tparams-bounds-b.check b/test/files/neg/macro-invalidsig-tparams-bounds-b.check index 50f0944acc..74eb522cdd 100644 --- a/test/files/neg/macro-invalidsig-tparams-bounds-b.check +++ b/test/files/neg/macro-invalidsig-tparams-bounds-b.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:2: error: type arguments [U] do not conform to method foo's type parameter bounds [U <: String] - def foo[U <: Int] = macro Impls.foo[U] - ^ -one error found +Macros_Test_2.scala:2: error: type arguments [U] do not conform to method foo's type parameter bounds [U <: String] + def foo[U <: Int] = macro Impls.foo[U] + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-tparams-notparams-a.check b/test/files/neg/macro-invalidsig-tparams-notparams-a.check index 5404c185f3..61a5628b7e 100644 --- a/test/files/neg/macro-invalidsig-tparams-notparams-a.check +++ b/test/files/neg/macro-invalidsig-tparams-notparams-a.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:2: error: wrong number of type parameters for method foo: [U](c: scala.reflect.macros.Context)(implicit evidence$1: c.WeakTypeTag[U])Nothing - def foo = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:2: error: wrong number of type parameters for method foo: [U](c: scala.reflect.macros.Context)(implicit evidence$1: c.WeakTypeTag[U])Nothing + def foo = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-tparams-notparams-b.check b/test/files/neg/macro-invalidsig-tparams-notparams-b.check index 485d4de96e..a605af6beb 100644 --- a/test/files/neg/macro-invalidsig-tparams-notparams-b.check +++ b/test/files/neg/macro-invalidsig-tparams-notparams-b.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:3: error: wrong number of type parameters for method foo: [T, U, V](c: scala.reflect.macros.Context)(implicit evidence$1: c.WeakTypeTag[T], implicit evidence$2: c.WeakTypeTag[U], implicit V: c.WeakTypeTag[V])c.Expr[Unit] - def foo[V] = macro Impls.foo - ^ -one error found +Macros_Test_2.scala:3: error: wrong number of type parameters for method foo: [T, U, V](c: scala.reflect.macros.Context)(implicit evidence$1: c.WeakTypeTag[T], implicit evidence$2: c.WeakTypeTag[U], implicit V: c.WeakTypeTag[V])c.Expr[Unit] + def foo[V] = macro Impls.foo + ^ +one error found diff --git a/test/files/neg/macro-invalidsig-tparams-notparams-c.check b/test/files/neg/macro-invalidsig-tparams-notparams-c.check index 1530c35097..0be0b6fad1 100644 --- a/test/files/neg/macro-invalidsig-tparams-notparams-c.check +++ b/test/files/neg/macro-invalidsig-tparams-notparams-c.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:3: error: wrong number of type parameters for method foo: [T, U, V](c: scala.reflect.macros.Context)(implicit evidence$1: c.WeakTypeTag[T], implicit evidence$2: c.WeakTypeTag[U], implicit V: c.WeakTypeTag[V])c.Expr[Unit] - def foo[V] = macro Impls.foo[V] - ^ -one error found +Macros_Test_2.scala:3: error: wrong number of type parameters for method foo: [T, U, V](c: scala.reflect.macros.Context)(implicit evidence$1: c.WeakTypeTag[T], implicit evidence$2: c.WeakTypeTag[U], implicit V: c.WeakTypeTag[V])c.Expr[Unit] + def foo[V] = macro Impls.foo[V] + ^ +one error found diff --git a/test/files/neg/macro-invalidusage-badargs.check b/test/files/neg/macro-invalidusage-badargs.check index 52beda5b61..294cfd0cf5 100644 --- a/test/files/neg/macro-invalidusage-badargs.check +++ b/test/files/neg/macro-invalidusage-badargs.check @@ -1,6 +1,6 @@ -Macros_Test_2.scala:7: error: type mismatch; - found : String("42") - required: Int - val s: String = foo("42") - ^ -one error found +Macros_Test_2.scala:7: error: type mismatch; + found : String("42") + required: Int + val s: String = foo("42") + ^ +one error found diff --git a/test/files/neg/macro-invalidusage-badbounds-a.check b/test/files/neg/macro-invalidusage-badbounds-a.check index fd0b64533e..277f407d38 100644 --- a/test/files/neg/macro-invalidusage-badbounds-a.check +++ b/test/files/neg/macro-invalidusage-badbounds-a.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String] - foo[Int] - ^ -one error found +Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String] + foo[Int] + ^ +one error found diff --git a/test/files/neg/macro-invalidusage-badtargs.check b/test/files/neg/macro-invalidusage-badtargs.check index 61ef6f5af7..73801ab43e 100644 --- a/test/files/neg/macro-invalidusage-badtargs.check +++ b/test/files/neg/macro-invalidusage-badtargs.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:7: error: macro method foo: (x: Int)Int does not take type parameters. - val s: String = foo[String](42) - ^ -one error found +Macros_Test_2.scala:7: error: macro method foo: (x: Int)Int does not take type parameters. + val s: String = foo[String](42) + ^ +one error found diff --git a/test/files/neg/macro-invalidusage-methodvaluesyntax.check b/test/files/neg/macro-invalidusage-methodvaluesyntax.check index 27b2023202..10046b2305 100644 --- a/test/files/neg/macro-invalidusage-methodvaluesyntax.check +++ b/test/files/neg/macro-invalidusage-methodvaluesyntax.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:6: error: macros cannot be eta-expanded - val firstClassFoo = Macros.foo _ - ^ -one error found +Macros_Test_2.scala:6: error: macros cannot be eta-expanded + val firstClassFoo = Macros.foo _ + ^ +one error found diff --git a/test/files/neg/macro-noexpand.check b/test/files/neg/macro-noexpand.check index c829bbab71..2c176a99be 100644 --- a/test/files/neg/macro-noexpand.check +++ b/test/files/neg/macro-noexpand.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:7: error: not found: value x - foo(x) - ^ -one error found +Macros_Test_2.scala:7: error: not found: value x + foo(x) + ^ +one error found diff --git a/test/files/neg/macro-nontypeablebody.check b/test/files/neg/macro-nontypeablebody.check index 0cfc864df8..9f5831ab30 100644 --- a/test/files/neg/macro-nontypeablebody.check +++ b/test/files/neg/macro-nontypeablebody.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:2: error: value foo2 is not a member of object Impls - def foo(x: Any) = macro Impls.foo2 - ^ -one error found +Macros_Test_2.scala:2: error: value foo2 is not a member of object Impls + def foo(x: Any) = macro Impls.foo2 + ^ +one error found diff --git a/test/files/neg/macro-override-macro-overrides-abstract-method-a.check b/test/files/neg/macro-override-macro-overrides-abstract-method-a.check index 4d95dfc45c..895e0dca50 100644 --- a/test/files/neg/macro-override-macro-overrides-abstract-method-a.check +++ b/test/files/neg/macro-override-macro-overrides-abstract-method-a.check @@ -1,5 +1,5 @@ -Impls_Macros_1.scala:12: error: overriding method foo in trait Foo of type (x: Int)Int; - macro method foo cannot override an abstract method - def foo(x: Int) = macro Impls.impl - ^ -one error found +Impls_Macros_1.scala:12: error: overriding method foo in trait Foo of type (x: Int)Int; + macro method foo cannot override an abstract method + def foo(x: Int) = macro Impls.impl + ^ +one error found diff --git a/test/files/neg/macro-override-macro-overrides-abstract-method-b.check b/test/files/neg/macro-override-macro-overrides-abstract-method-b.check index 4d95dfc45c..895e0dca50 100644 --- a/test/files/neg/macro-override-macro-overrides-abstract-method-b.check +++ b/test/files/neg/macro-override-macro-overrides-abstract-method-b.check @@ -1,5 +1,5 @@ -Impls_Macros_1.scala:12: error: overriding method foo in trait Foo of type (x: Int)Int; - macro method foo cannot override an abstract method - def foo(x: Int) = macro Impls.impl - ^ -one error found +Impls_Macros_1.scala:12: error: overriding method foo in trait Foo of type (x: Int)Int; + macro method foo cannot override an abstract method + def foo(x: Int) = macro Impls.impl + ^ +one error found diff --git a/test/files/neg/macro-override-method-overrides-macro.check b/test/files/neg/macro-override-method-overrides-macro.check index 42edb0ff23..66dc11be96 100644 --- a/test/files/neg/macro-override-method-overrides-macro.check +++ b/test/files/neg/macro-override-method-overrides-macro.check @@ -1,5 +1,5 @@ -Macros_Test_2.scala:8: error: overriding macro method foo in class B of type (x: String)Unit; - method foo cannot override a macro - override def foo(x: String) = println("fooDString") - ^ -one error found +Macros_Test_2.scala:8: error: overriding macro method foo in class B of type (x: String)Unit; + method foo cannot override a macro + override def foo(x: String) = println("fooDString") + ^ +one error found diff --git a/test/files/neg/macro-reify-typetag-hktypeparams-notags.check b/test/files/neg/macro-reify-typetag-hktypeparams-notags.check index 742d87b0a4..44efaae775 100644 --- a/test/files/neg/macro-reify-typetag-hktypeparams-notags.check +++ b/test/files/neg/macro-reify-typetag-hktypeparams-notags.check @@ -1,7 +1,7 @@ -Test.scala:5: error: No TypeTag available for C[T] - println(implicitly[TypeTag[C[T]]]) - ^ -Test.scala:6: error: No TypeTag available for List[C[T]] - println(implicitly[TypeTag[List[C[T]]]]) - ^ -two errors found +Test.scala:5: error: No TypeTag available for C[T] + println(implicitly[TypeTag[C[T]]]) + ^ +Test.scala:6: error: No TypeTag available for List[C[T]] + println(implicitly[TypeTag[List[C[T]]]]) + ^ +two errors found diff --git a/test/files/neg/macro-reify-typetag-typeparams-notags.check b/test/files/neg/macro-reify-typetag-typeparams-notags.check index db88260047..7c67b02aa6 100644 --- a/test/files/neg/macro-reify-typetag-typeparams-notags.check +++ b/test/files/neg/macro-reify-typetag-typeparams-notags.check @@ -1,7 +1,7 @@ -Test.scala:5: error: No TypeTag available for T - println(implicitly[TypeTag[T]]) - ^ -Test.scala:6: error: No TypeTag available for List[T] - println(implicitly[TypeTag[List[T]]]) - ^ -two errors found +Test.scala:5: error: No TypeTag available for T + println(implicitly[TypeTag[T]]) + ^ +Test.scala:6: error: No TypeTag available for List[T] + println(implicitly[TypeTag[List[T]]]) + ^ +two errors found diff --git a/test/files/neg/macro-reify-typetag-useabstypetag.check b/test/files/neg/macro-reify-typetag-useabstypetag.check index db88260047..7c67b02aa6 100644 --- a/test/files/neg/macro-reify-typetag-useabstypetag.check +++ b/test/files/neg/macro-reify-typetag-useabstypetag.check @@ -1,7 +1,7 @@ -Test.scala:5: error: No TypeTag available for T - println(implicitly[TypeTag[T]]) - ^ -Test.scala:6: error: No TypeTag available for List[T] - println(implicitly[TypeTag[List[T]]]) - ^ -two errors found +Test.scala:5: error: No TypeTag available for T + println(implicitly[TypeTag[T]]) + ^ +Test.scala:6: error: No TypeTag available for List[T] + println(implicitly[TypeTag[List[T]]]) + ^ +two errors found diff --git a/test/files/neg/reify_ann2b.check b/test/files/neg/reify_ann2b.check index 1cef405bef..d32bedaf8f 100644 --- a/test/files/neg/reify_ann2b.check +++ b/test/files/neg/reify_ann2b.check @@ -1,4 +1,4 @@ -reify_ann2b.scala:9: error: inner classes cannot be classfile annotations - class ann(bar: String) extends annotation.ClassfileAnnotation - ^ -one error found +reify_ann2b.scala:9: error: inner classes cannot be classfile annotations + class ann(bar: String) extends annotation.ClassfileAnnotation + ^ +one error found diff --git a/test/files/neg/reify_metalevel_breach_+0_refers_to_1.check b/test/files/neg/reify_metalevel_breach_+0_refers_to_1.check index efdbd7e282..75b7555b01 100644 --- a/test/files/neg/reify_metalevel_breach_+0_refers_to_1.check +++ b/test/files/neg/reify_metalevel_breach_+0_refers_to_1.check @@ -1,7 +1,7 @@ -reify_metalevel_breach_+0_refers_to_1.scala:10: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. -cross-stage evaluations need to be invoked explicitly, so we're showing you this error. -if you're sure this is not an oversight, add scala-compiler.jar to the classpath, -import `scala.tools.reflect.Eval` and call `.eval` instead. - inner.splice - ^ -one error found +reify_metalevel_breach_+0_refers_to_1.scala:10: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. +cross-stage evaluations need to be invoked explicitly, so we're showing you this error. +if you're sure this is not an oversight, add scala-compiler.jar to the classpath, +import `scala.tools.reflect.Eval` and call `.eval` instead. + inner.splice + ^ +one error found diff --git a/test/files/neg/reify_metalevel_breach_-1_refers_to_0_a.check b/test/files/neg/reify_metalevel_breach_-1_refers_to_0_a.check index 91755c789a..ca5556db02 100644 --- a/test/files/neg/reify_metalevel_breach_-1_refers_to_0_a.check +++ b/test/files/neg/reify_metalevel_breach_-1_refers_to_0_a.check @@ -1,7 +1,7 @@ -reify_metalevel_breach_-1_refers_to_0_a.scala:9: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. -cross-stage evaluations need to be invoked explicitly, so we're showing you this error. -if you're sure this is not an oversight, add scala-compiler.jar to the classpath, -import `scala.tools.reflect.Eval` and call `.eval` instead. - val code = reify{outer.splice.splice} - ^ -one error found +reify_metalevel_breach_-1_refers_to_0_a.scala:9: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. +cross-stage evaluations need to be invoked explicitly, so we're showing you this error. +if you're sure this is not an oversight, add scala-compiler.jar to the classpath, +import `scala.tools.reflect.Eval` and call `.eval` instead. + val code = reify{outer.splice.splice} + ^ +one error found diff --git a/test/files/neg/reify_metalevel_breach_-1_refers_to_0_b.check b/test/files/neg/reify_metalevel_breach_-1_refers_to_0_b.check index f703bfb05f..e34cb1ac1e 100644 --- a/test/files/neg/reify_metalevel_breach_-1_refers_to_0_b.check +++ b/test/files/neg/reify_metalevel_breach_-1_refers_to_0_b.check @@ -1,7 +1,7 @@ -reify_metalevel_breach_-1_refers_to_0_b.scala:12: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. -cross-stage evaluations need to be invoked explicitly, so we're showing you this error. -if you're sure this is not an oversight, add scala-compiler.jar to the classpath, -import `scala.tools.reflect.Eval` and call `.eval` instead. - }.splice - ^ -one error found +reify_metalevel_breach_-1_refers_to_0_b.scala:12: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. +cross-stage evaluations need to be invoked explicitly, so we're showing you this error. +if you're sure this is not an oversight, add scala-compiler.jar to the classpath, +import `scala.tools.reflect.Eval` and call `.eval` instead. + }.splice + ^ +one error found diff --git a/test/files/neg/reify_metalevel_breach_-1_refers_to_1.check b/test/files/neg/reify_metalevel_breach_-1_refers_to_1.check index 068e4accd2..90b0e8dac6 100644 --- a/test/files/neg/reify_metalevel_breach_-1_refers_to_1.check +++ b/test/files/neg/reify_metalevel_breach_-1_refers_to_1.check @@ -1,7 +1,7 @@ -reify_metalevel_breach_-1_refers_to_1.scala:10: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. -cross-stage evaluations need to be invoked explicitly, so we're showing you this error. -if you're sure this is not an oversight, add scala-compiler.jar to the classpath, -import `scala.tools.reflect.Eval` and call `.eval` instead. - inner.splice.splice - ^ -one error found +reify_metalevel_breach_-1_refers_to_1.scala:10: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. +cross-stage evaluations need to be invoked explicitly, so we're showing you this error. +if you're sure this is not an oversight, add scala-compiler.jar to the classpath, +import `scala.tools.reflect.Eval` and call `.eval` instead. + inner.splice.splice + ^ +one error found diff --git a/test/files/neg/reify_nested_inner_refers_to_local.check b/test/files/neg/reify_nested_inner_refers_to_local.check index 3f897bded9..68689b18d0 100644 --- a/test/files/neg/reify_nested_inner_refers_to_local.check +++ b/test/files/neg/reify_nested_inner_refers_to_local.check @@ -1,7 +1,7 @@ -reify_nested_inner_refers_to_local.scala:9: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. -cross-stage evaluations need to be invoked explicitly, so we're showing you this error. -if you're sure this is not an oversight, add scala-compiler.jar to the classpath, -import `scala.tools.reflect.Eval` and call `.eval` instead. - reify{x}.splice - ^ -one error found +reify_nested_inner_refers_to_local.scala:9: error: the splice cannot be resolved statically, which means there is a cross-stage evaluation involved. +cross-stage evaluations need to be invoked explicitly, so we're showing you this error. +if you're sure this is not an oversight, add scala-compiler.jar to the classpath, +import `scala.tools.reflect.Eval` and call `.eval` instead. + reify{x}.splice + ^ +one error found diff --git a/test/files/neg/t2775.check b/test/files/neg/t2775.check index f357221cd9..934a970f2e 100644 --- a/test/files/neg/t2775.check +++ b/test/files/neg/t2775.check @@ -1,4 +1,4 @@ -t2775.scala:1: error: cannot find class tag for element type B.this.T -trait B[S] { type T = S; val c = new Array[T](1) } - ^ -one error found +t2775.scala:1: error: cannot find class tag for element type B.this.T +trait B[S] { type T = S; val c = new Array[T](1) } + ^ +one error found diff --git a/test/files/neg/t3507-old.check b/test/files/neg/t3507-old.check index 5c58444cb3..b3ac40473e 100644 --- a/test/files/neg/t3507-old.check +++ b/test/files/neg/t3507-old.check @@ -1,4 +1,4 @@ -t3507-old.scala:13: error: No Manifest available for _1.b.c.type. - mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier - ^ -one error found +t3507-old.scala:13: error: No Manifest available for _1.b.c.type. + mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier + ^ +one error found diff --git a/test/files/neg/t5452-new.check b/test/files/neg/t5452-new.check index 4bbeff3644..1850a7004a 100644 --- a/test/files/neg/t5452-new.check +++ b/test/files/neg/t5452-new.check @@ -1,8 +1,8 @@ -t5452-new.scala:30: error: overloaded method value apply with alternatives: - ()Queryable[CoffeesTable] - (t: Tree)(implicit evidence$2: scala.reflect.ClassTag[CoffeesTable])Nothing - (implicit evidence$1: scala.reflect.ClassTag[CoffeesTable])Nothing - cannot be applied to (Queryable[CoffeesTable]) - Queryable[CoffeesTable]( q.treeFilter(null) ) - ^ -one error found +t5452-new.scala:30: error: overloaded method value apply with alternatives: + ()Queryable[CoffeesTable] + (t: Tree)(implicit evidence$2: scala.reflect.ClassTag[CoffeesTable])Nothing + (implicit evidence$1: scala.reflect.ClassTag[CoffeesTable])Nothing + cannot be applied to (Queryable[CoffeesTable]) + Queryable[CoffeesTable]( q.treeFilter(null) ) + ^ +one error found diff --git a/test/files/neg/t5452-old.check b/test/files/neg/t5452-old.check index e5872a5759..1860c98c53 100644 --- a/test/files/neg/t5452-old.check +++ b/test/files/neg/t5452-old.check @@ -1,8 +1,8 @@ -t5452-old.scala:28: error: overloaded method value apply with alternatives: - ()Queryable[CoffeesTable] - (t: Tree)(implicit evidence$2: Manifest[CoffeesTable])Nothing - (implicit evidence$1: Manifest[CoffeesTable])Nothing - cannot be applied to (Queryable[CoffeesTable]) - Queryable[CoffeesTable]( q.treeFilter(null) ) - ^ -one error found +t5452-old.scala:28: error: overloaded method value apply with alternatives: + ()Queryable[CoffeesTable] + (t: Tree)(implicit evidence$2: Manifest[CoffeesTable])Nothing + (implicit evidence$1: Manifest[CoffeesTable])Nothing + cannot be applied to (Queryable[CoffeesTable]) + Queryable[CoffeesTable]( q.treeFilter(null) ) + ^ +one error found diff --git a/test/files/neg/t5689.check b/test/files/neg/t5689.check index 3b25dd612e..50aaa7dbfe 100644 --- a/test/files/neg/t5689.check +++ b/test/files/neg/t5689.check @@ -1,7 +1,7 @@ -t5689.scala:4: error: macro implementation has wrong shape: - required: (c: scala.reflect.macros.Context)(i: c.Expr[Double]): c.Expr[String] - found : (c: scala.reflect.macros.Context)(i: c.Expr[Double]): c.Expr[Int] -type mismatch for return type: c.Expr[Int] does not conform to c.Expr[String] - def returnsString(i: Double): String = macro returnsIntImpl - ^ -one error found +t5689.scala:4: error: macro implementation has wrong shape: + required: (c: scala.reflect.macros.Context)(i: c.Expr[Double]): c.Expr[String] + found : (c: scala.reflect.macros.Context)(i: c.Expr[Double]): c.Expr[Int] +type mismatch for return type: c.Expr[Int] does not conform to c.Expr[String] + def returnsString(i: Double): String = macro returnsIntImpl + ^ +one error found diff --git a/test/files/neg/t5692a.check b/test/files/neg/t5692a.check index 527cb35fba..ded95a8820 100644 --- a/test/files/neg/t5692a.check +++ b/test/files/neg/t5692a.check @@ -1,4 +1,4 @@ -Test_2.scala:2: error: type parameter not specified - def x = Macros.foo - ^ -one error found +Test_2.scala:2: error: type parameter not specified + def x = Macros.foo + ^ +one error found diff --git a/test/files/neg/t5692b.check b/test/files/neg/t5692b.check index 8f6b2624cf..e453870ec8 100644 --- a/test/files/neg/t5692b.check +++ b/test/files/neg/t5692b.check @@ -1,4 +1,4 @@ -Test_2.scala:2: error: type parameters not specified - def x = Macros.foo - ^ -one error found +Test_2.scala:2: error: type parameters not specified + def x = Macros.foo + ^ +one error found diff --git a/test/files/neg/t6323a.check b/test/files/neg/t6323a.check index 694c79ca5f..670247887c 100644 --- a/test/files/neg/t6323a.check +++ b/test/files/neg/t6323a.check @@ -1,9 +1,9 @@ -t6323a.scala:11: `package`.this.materializeTypeTag[Test](scala.reflect.runtime.`package`.universe) is not a valid implicit value for reflect.runtime.universe.TypeTag[Test] because: -failed to typecheck the materialized tag: -cannot create a TypeTag referring to local class Test.Test - val value = u.typeOf[Test] - ^ -t6323a.scala:11: error: No TypeTag available for Test - val value = u.typeOf[Test] - ^ -one error found +t6323a.scala:11: `package`.this.materializeTypeTag[Test](scala.reflect.runtime.`package`.universe) is not a valid implicit value for reflect.runtime.universe.TypeTag[Test] because: +failed to typecheck the materialized tag: +cannot create a TypeTag referring to local class Test.Test + val value = u.typeOf[Test] + ^ +t6323a.scala:11: error: No TypeTag available for Test + val value = u.typeOf[Test] + ^ +one error found diff --git a/test/files/pos/t5245.scala b/test/files/pos/t5245.scala index 3a4b4d286e..763be9ec26 100644 --- a/test/files/pos/t5245.scala +++ b/test/files/pos/t5245.scala @@ -1,3 +1,3 @@ -object Foo { +object Foo { def bar = { var x = (); def foo() = x } } \ No newline at end of file diff --git a/test/files/run/abstypetags_core.check b/test/files/run/abstypetags_core.check index 8d20e099c4..980b4719bf 100644 --- a/test/files/run/abstypetags_core.check +++ b/test/files/run/abstypetags_core.check @@ -1,30 +1,30 @@ -true -TypeTag[Byte] -true -TypeTag[Short] -true -TypeTag[Char] -true -TypeTag[Int] -true -TypeTag[Long] -true -TypeTag[Float] -true -TypeTag[Double] -true -TypeTag[Boolean] -true -TypeTag[Unit] -true -TypeTag[Any] -true -TypeTag[AnyVal] -true -TypeTag[AnyRef] -true -TypeTag[java.lang.Object] -true -TypeTag[Null] -true -TypeTag[Nothing] +true +TypeTag[Byte] +true +TypeTag[Short] +true +TypeTag[Char] +true +TypeTag[Int] +true +TypeTag[Long] +true +TypeTag[Float] +true +TypeTag[Double] +true +TypeTag[Boolean] +true +TypeTag[Unit] +true +TypeTag[Any] +true +TypeTag[AnyVal] +true +TypeTag[AnyRef] +true +TypeTag[java.lang.Object] +true +TypeTag[Null] +true +TypeTag[Nothing] diff --git a/test/files/run/abstypetags_serialize.check b/test/files/run/abstypetags_serialize.check index aafb4761ad..bddc4523e6 100644 --- a/test/files/run/abstypetags_serialize.check +++ b/test/files/run/abstypetags_serialize.check @@ -1,2 +1,2 @@ -java.io.NotSerializableException: Test$$typecreator1$1 -java.io.NotSerializableException: Test$$typecreator2$1 +java.io.NotSerializableException: Test$$typecreator1$1 +java.io.NotSerializableException: Test$$typecreator2$1 diff --git a/test/files/run/classmanifests_new_alias.check b/test/files/run/classmanifests_new_alias.check index ffb8482f91..032521a929 100644 --- a/test/files/run/classmanifests_new_alias.check +++ b/test/files/run/classmanifests_new_alias.check @@ -1,2 +1,2 @@ -Int -true +Int +true diff --git a/test/files/run/classmanifests_new_core.check b/test/files/run/classmanifests_new_core.check index ffb8482f91..032521a929 100644 --- a/test/files/run/classmanifests_new_core.check +++ b/test/files/run/classmanifests_new_core.check @@ -1,2 +1,2 @@ -Int -true +Int +true diff --git a/test/files/run/classtags_contextbound.check b/test/files/run/classtags_contextbound.check index 4104d544ba..604122846e 100644 --- a/test/files/run/classtags_contextbound.check +++ b/test/files/run/classtags_contextbound.check @@ -1 +1 @@ -class [I +class [I diff --git a/test/files/run/classtags_core.check b/test/files/run/classtags_core.check index 5a9b41fd6d..d5c4386482 100644 --- a/test/files/run/classtags_core.check +++ b/test/files/run/classtags_core.check @@ -1,30 +1,30 @@ -true -Byte -true -Short -true -Char -true -Int -true -Long -true -Float -true -Double -true -Boolean -true -Unit -true -Any -true -AnyVal -true -Object -true -Object -true -Null -true -Nothing +true +Byte +true +Short +true +Char +true +Int +true +Long +true +Float +true +Double +true +Boolean +true +Unit +true +Any +true +AnyVal +true +Object +true +Object +true +Null +true +Nothing diff --git a/test/files/run/classtags_multi.check b/test/files/run/classtags_multi.check index 68cee4841d..56da87eeb1 100644 --- a/test/files/run/classtags_multi.check +++ b/test/files/run/classtags_multi.check @@ -1,5 +1,5 @@ -Int -Array[int] -Array[Array[int]] -Array[Array[Array[int]]] -Array[Array[Array[Array[int]]]] +Int +Array[int] +Array[Array[int]] +Array[Array[Array[int]]] +Array[Array[Array[Array[int]]]] diff --git a/test/files/run/existentials3-new.check b/test/files/run/existentials3-new.check index 2550f4dae0..bb6fe1a5e3 100644 --- a/test/files/run/existentials3-new.check +++ b/test/files/run/existentials3-new.check @@ -1,24 +1,24 @@ -Bar.type, t=TypeRef, s=type Bar.type -Bar, t=TypeRef, s=type Bar -Test.ToS, t=RefinedType, s=f3 -Test.ToS, t=RefinedType, s=f4 -Test.ToS, t=RefinedType, s=f5 -() => Test.ToS, t=TypeRef, s=class Function0 -() => Test.ToS, t=TypeRef, s=class Function0 -$anon, t=TypeRef, s=type $anon -$anon, t=TypeRef, s=type $anon -List[java.lang.Object{type T1}#T1], t=TypeRef, s=class List -List[Seq[Int]], t=TypeRef, s=class List -List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List -Bar.type, t=TypeRef, s=type Bar.type -Bar, t=TypeRef, s=type Bar -Test.ToS, t=RefinedType, s=g3 -Test.ToS, t=RefinedType, s=g4 -Test.ToS, t=RefinedType, s=g5 -() => Test.ToS, t=TypeRef, s=class Function0 -() => Test.ToS, t=TypeRef, s=class Function0 -$anon, t=TypeRef, s=type $anon -$anon, t=TypeRef, s=type $anon -List[java.lang.Object{type T1}#T1], t=TypeRef, s=class List -List[Seq[Int]], t=TypeRef, s=class List -List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List +Bar.type, t=TypeRef, s=type Bar.type +Bar, t=TypeRef, s=type Bar +Test.ToS, t=RefinedType, s=f3 +Test.ToS, t=RefinedType, s=f4 +Test.ToS, t=RefinedType, s=f5 +() => Test.ToS, t=TypeRef, s=class Function0 +() => Test.ToS, t=TypeRef, s=class Function0 +$anon, t=TypeRef, s=type $anon +$anon, t=TypeRef, s=type $anon +List[java.lang.Object{type T1}#T1], t=TypeRef, s=class List +List[Seq[Int]], t=TypeRef, s=class List +List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List +Bar.type, t=TypeRef, s=type Bar.type +Bar, t=TypeRef, s=type Bar +Test.ToS, t=RefinedType, s=g3 +Test.ToS, t=RefinedType, s=g4 +Test.ToS, t=RefinedType, s=g5 +() => Test.ToS, t=TypeRef, s=class Function0 +() => Test.ToS, t=TypeRef, s=class Function0 +$anon, t=TypeRef, s=type $anon +$anon, t=TypeRef, s=type $anon +List[java.lang.Object{type T1}#T1], t=TypeRef, s=class List +List[Seq[Int]], t=TypeRef, s=class List +List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List diff --git a/test/files/run/exprs_serialize.check b/test/files/run/exprs_serialize.check index a3bf9ccdc4..20ad6c110c 100644 --- a/test/files/run/exprs_serialize.check +++ b/test/files/run/exprs_serialize.check @@ -1,2 +1,2 @@ -java.io.NotSerializableException: Test$$treecreator1$1 -java.io.NotSerializableException: Test$$treecreator2$1 +java.io.NotSerializableException: Test$$treecreator1$1 +java.io.NotSerializableException: Test$$treecreator2$1 diff --git a/test/files/run/freetypes_false_alarm1.check b/test/files/run/freetypes_false_alarm1.check index 92efacc2b7..a9df3544ac 100644 --- a/test/files/run/freetypes_false_alarm1.check +++ b/test/files/run/freetypes_false_alarm1.check @@ -1 +1 @@ -List[Int] +List[Int] diff --git a/test/files/run/interop_classtags_are_classmanifests.check b/test/files/run/interop_classtags_are_classmanifests.check index c07ed0e657..5a8fc2b782 100644 --- a/test/files/run/interop_classtags_are_classmanifests.check +++ b/test/files/run/interop_classtags_are_classmanifests.check @@ -1,3 +1,3 @@ -Int -java.lang.String -Array[int] +Int +java.lang.String +Array[int] diff --git a/test/files/run/interop_manifests_are_abstypetags.check b/test/files/run/interop_manifests_are_abstypetags.check index c59e92d4eb..19a35ad3db 100644 --- a/test/files/run/interop_manifests_are_abstypetags.check +++ b/test/files/run/interop_manifests_are_abstypetags.check @@ -1,3 +1,3 @@ -Int -java.lang.String -Array[Int] +Int +java.lang.String +Array[Int] diff --git a/test/files/run/interop_manifests_are_classtags.check b/test/files/run/interop_manifests_are_classtags.check index aaf4aba012..f3f704121b 100644 --- a/test/files/run/interop_manifests_are_classtags.check +++ b/test/files/run/interop_manifests_are_classtags.check @@ -1,18 +1,18 @@ -Int -List() -List(0, 0, 0, 0, 0) -java.lang.String -List() -List(null, null, null, null, null) -Array[Int] -List() -List(null, null, null, null, null) -Int -List() -List(0, 0, 0, 0, 0) -java.lang.String -List() -List(null, null, null, null, null) -Array[Int] -List() -List(null, null, null, null, null) +Int +List() +List(0, 0, 0, 0, 0) +java.lang.String +List() +List(null, null, null, null, null) +Array[Int] +List() +List(null, null, null, null, null) +Int +List() +List(0, 0, 0, 0, 0) +java.lang.String +List() +List(null, null, null, null, null) +Array[Int] +List() +List(null, null, null, null, null) diff --git a/test/files/run/interop_manifests_are_typetags.check b/test/files/run/interop_manifests_are_typetags.check index c59e92d4eb..19a35ad3db 100644 --- a/test/files/run/interop_manifests_are_typetags.check +++ b/test/files/run/interop_manifests_are_typetags.check @@ -1,3 +1,3 @@ -Int -java.lang.String -Array[Int] +Int +java.lang.String +Array[Int] diff --git a/test/files/run/interop_typetags_are_manifests.check b/test/files/run/interop_typetags_are_manifests.check index 871167e3ab..e02de1fdc2 100644 --- a/test/files/run/interop_typetags_are_manifests.check +++ b/test/files/run/interop_typetags_are_manifests.check @@ -1,3 +1,3 @@ -int -java.lang.String -Array[Int] +int +java.lang.String +Array[Int] diff --git a/test/files/run/macro-abort-fresh.check b/test/files/run/macro-abort-fresh.check index 28057c2883..75ad5e79f8 100644 --- a/test/files/run/macro-abort-fresh.check +++ b/test/files/run/macro-abort-fresh.check @@ -1,6 +1,6 @@ -$1$ -qwe1 -qwe2 -reflective compilation has failed: - -blargh +$1$ +qwe1 +qwe2 +reflective compilation has failed: + +blargh diff --git a/test/files/run/macro-declared-in-annotation.check b/test/files/run/macro-declared-in-annotation.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-declared-in-annotation.check +++ b/test/files/run/macro-declared-in-annotation.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-declared-in-block.check b/test/files/run/macro-declared-in-block.check index a61fd13087..5e687db8bf 100644 --- a/test/files/run/macro-declared-in-block.check +++ b/test/files/run/macro-declared-in-block.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing]() -it works +prefix = Expr[Nothing]() +it works diff --git a/test/files/run/macro-declared-in-class-class.check b/test/files/run/macro-declared-in-class-class.check index 480c2f906f..47248d7af7 100644 --- a/test/files/run/macro-declared-in-class-class.check +++ b/test/files/run/macro-declared-in-class-class.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](new Test.this.outer.Macros()) -it works +prefix = Expr[Nothing](new Test.this.outer.Macros()) +it works diff --git a/test/files/run/macro-declared-in-class-object.check b/test/files/run/macro-declared-in-class-object.check index f7ba5a53cb..35af59e40f 100644 --- a/test/files/run/macro-declared-in-class-object.check +++ b/test/files/run/macro-declared-in-class-object.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](Test.this.outer.Macros) -it works +prefix = Expr[Nothing](Test.this.outer.Macros) +it works diff --git a/test/files/run/macro-declared-in-class.check b/test/files/run/macro-declared-in-class.check index 946851e4bb..a1c1d7af8b 100644 --- a/test/files/run/macro-declared-in-class.check +++ b/test/files/run/macro-declared-in-class.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](new Macros()) -it works +prefix = Expr[Nothing](new Macros()) +it works diff --git a/test/files/run/macro-declared-in-default-param.check b/test/files/run/macro-declared-in-default-param.check index 00052ad018..6decd7aa4d 100644 --- a/test/files/run/macro-declared-in-default-param.check +++ b/test/files/run/macro-declared-in-default-param.check @@ -1,5 +1,5 @@ -prefix = Expr[Nothing]() -it works -it works -prefix = Expr[Nothing]() -it works +prefix = Expr[Nothing]() +it works +it works +prefix = Expr[Nothing]() +it works diff --git a/test/files/run/macro-declared-in-implicit-class.check b/test/files/run/macro-declared-in-implicit-class.check index b3640ceaa7..5dc968c08c 100644 --- a/test/files/run/macro-declared-in-implicit-class.check +++ b/test/files/run/macro-declared-in-implicit-class.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](Macros.foo("2")) -Some(2) +prefix = Expr[Nothing](Macros.foo("2")) +Some(2) diff --git a/test/files/run/macro-declared-in-method.check b/test/files/run/macro-declared-in-method.check index a61fd13087..5e687db8bf 100644 --- a/test/files/run/macro-declared-in-method.check +++ b/test/files/run/macro-declared-in-method.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing]() -it works +prefix = Expr[Nothing]() +it works diff --git a/test/files/run/macro-declared-in-object-class.check b/test/files/run/macro-declared-in-object-class.check index 480c2f906f..47248d7af7 100644 --- a/test/files/run/macro-declared-in-object-class.check +++ b/test/files/run/macro-declared-in-object-class.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](new Test.this.outer.Macros()) -it works +prefix = Expr[Nothing](new Test.this.outer.Macros()) +it works diff --git a/test/files/run/macro-declared-in-object-object.check b/test/files/run/macro-declared-in-object-object.check index f7ba5a53cb..35af59e40f 100644 --- a/test/files/run/macro-declared-in-object-object.check +++ b/test/files/run/macro-declared-in-object-object.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](Test.this.outer.Macros) -it works +prefix = Expr[Nothing](Test.this.outer.Macros) +it works diff --git a/test/files/run/macro-declared-in-object.check b/test/files/run/macro-declared-in-object.check index 05a8cc48ea..4d955a96b1 100644 --- a/test/files/run/macro-declared-in-object.check +++ b/test/files/run/macro-declared-in-object.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](Macros) -it works +prefix = Expr[Nothing](Macros) +it works diff --git a/test/files/run/macro-declared-in-package-object.check b/test/files/run/macro-declared-in-package-object.check index 6f797f3c68..bc0069178d 100644 --- a/test/files/run/macro-declared-in-package-object.check +++ b/test/files/run/macro-declared-in-package-object.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](Macros.`package`) -it works +prefix = Expr[Nothing](Macros.`package`) +it works diff --git a/test/files/run/macro-declared-in-refinement.check b/test/files/run/macro-declared-in-refinement.check index 861cd43b01..09b8d015a6 100644 --- a/test/files/run/macro-declared-in-refinement.check +++ b/test/files/run/macro-declared-in-refinement.check @@ -1,2 +1,2 @@ -prefix = Expr[Nothing](Test.this.macros) -it works +prefix = Expr[Nothing](Test.this.macros) +it works diff --git a/test/files/run/macro-declared-in-trait.check b/test/files/run/macro-declared-in-trait.check index d5d9e4e457..104ff1e99b 100644 --- a/test/files/run/macro-declared-in-trait.check +++ b/test/files/run/macro-declared-in-trait.check @@ -1,15 +1,15 @@ -prefix = Expr[Nothing]({ - final class $anon extends Object with Base { - def (): anonymous class $anon = { - $anon.super.(); - () - }; - - }; - new $anon() -}) -it works -prefix = Expr[Nothing](Macros) -it works -prefix = Expr[Nothing](new Macros()) -it works +prefix = Expr[Nothing]({ + final class $anon extends Object with Base { + def (): anonymous class $anon = { + $anon.super.(); + () + }; + + }; + new $anon() +}) +it works +prefix = Expr[Nothing](Macros) +it works +prefix = Expr[Nothing](new Macros()) +it works diff --git a/test/files/run/macro-def-infer-return-type-b.check b/test/files/run/macro-def-infer-return-type-b.check index f34d257c82..ae2dc7a06f 100644 --- a/test/files/run/macro-def-infer-return-type-b.check +++ b/test/files/run/macro-def-infer-return-type-b.check @@ -1,6 +1,6 @@ -reflective compilation has failed: - -exception during macro expansion: -java.lang.Error: an implementation is missing - at Impls$.foo(Impls_Macros_1.scala:5) - +reflective compilation has failed: + +exception during macro expansion: +java.lang.Error: an implementation is missing + at Impls$.foo(Impls_Macros_1.scala:5) + diff --git a/test/files/run/macro-def-path-dependent-a.check b/test/files/run/macro-def-path-dependent-a.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-def-path-dependent-a.check +++ b/test/files/run/macro-def-path-dependent-a.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-def-path-dependent-b.check b/test/files/run/macro-def-path-dependent-b.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-def-path-dependent-b.check +++ b/test/files/run/macro-def-path-dependent-b.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-def-path-dependent-c.check b/test/files/run/macro-def-path-dependent-c.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-def-path-dependent-c.check +++ b/test/files/run/macro-def-path-dependent-c.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-def-path-dependent-d1.check b/test/files/run/macro-def-path-dependent-d1.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-def-path-dependent-d1.check +++ b/test/files/run/macro-def-path-dependent-d1.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-def-path-dependent-d2.check b/test/files/run/macro-def-path-dependent-d2.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-def-path-dependent-d2.check +++ b/test/files/run/macro-def-path-dependent-d2.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-expand-implicit-argument.check b/test/files/run/macro-expand-implicit-argument.check index fb42345748..15a62794a9 100644 --- a/test/files/run/macro-expand-implicit-argument.check +++ b/test/files/run/macro-expand-implicit-argument.check @@ -1 +1 @@ -List(1, 2, 3) +List(1, 2, 3) diff --git a/test/files/run/macro-expand-implicit-macro-has-implicit.check b/test/files/run/macro-expand-implicit-macro-has-implicit.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/macro-expand-implicit-macro-has-implicit.check +++ b/test/files/run/macro-expand-implicit-macro-has-implicit.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/macro-expand-implicit-macro-is-implicit.check b/test/files/run/macro-expand-implicit-macro-is-implicit.check index 42abf4579b..c205945d05 100644 --- a/test/files/run/macro-expand-implicit-macro-is-implicit.check +++ b/test/files/run/macro-expand-implicit-macro-is-implicit.check @@ -1,2 +1,2 @@ -Some(2) -2 +Some(2) +2 diff --git a/test/files/run/macro-expand-implicit-macro-is-val.check b/test/files/run/macro-expand-implicit-macro-is-val.check index 78c6baefdd..0cfbf08886 100644 --- a/test/files/run/macro-expand-implicit-macro-is-val.check +++ b/test/files/run/macro-expand-implicit-macro-is-val.check @@ -1 +1 @@ -2 +2 diff --git a/test/files/run/macro-expand-implicit-macro-is-view.check b/test/files/run/macro-expand-implicit-macro-is-view.check index 78c6baefdd..0cfbf08886 100644 --- a/test/files/run/macro-expand-implicit-macro-is-view.check +++ b/test/files/run/macro-expand-implicit-macro-is-view.check @@ -1 +1 @@ -2 +2 diff --git a/test/files/run/macro-expand-nullary-generic.check b/test/files/run/macro-expand-nullary-generic.check index 0895c30c3f..133840c469 100644 --- a/test/files/run/macro-expand-nullary-generic.check +++ b/test/files/run/macro-expand-nullary-generic.check @@ -1,6 +1,6 @@ -it works TypeTag[Int] -it works TypeTag[Int] -it works TypeTag[Int] -it works TypeTag[Int] -it works TypeTag[Int] -kkthxbai +it works TypeTag[Int] +it works TypeTag[Int] +it works TypeTag[Int] +it works TypeTag[Int] +it works TypeTag[Int] +kkthxbai diff --git a/test/files/run/macro-expand-overload.check b/test/files/run/macro-expand-overload.check index 9d9989d85f..a2b7b0e781 100644 --- a/test/files/run/macro-expand-overload.check +++ b/test/files/run/macro-expand-overload.check @@ -1,6 +1,6 @@ -(fooObjectString,Expr[Nothing](Macros),42) -(fooObjectInt,Expr[Nothing](Macros),42) -fooObjectBoolean -(fooClassString,Expr[Nothing](new Macros()),42) -(fooClassInt,Expr[Nothing](new Macros()),42) -fooClassBoolean +(fooObjectString,Expr[Nothing](Macros),42) +(fooObjectInt,Expr[Nothing](Macros),42) +fooObjectBoolean +(fooClassString,Expr[Nothing](new Macros()),42) +(fooClassInt,Expr[Nothing](new Macros()),42) +fooClassBoolean diff --git a/test/files/run/macro-expand-override.check b/test/files/run/macro-expand-override.check index 486bec7098..b41dc156c4 100644 --- a/test/files/run/macro-expand-override.check +++ b/test/files/run/macro-expand-override.check @@ -1,15 +1,15 @@ -(fooBString,Expr[Nothing](Test.this.dd),42) -(fooDInt,Expr[Nothing](Test.this.dd),42) -fooBBoolean -(fooBString,Expr[Nothing](Test.this.db),42) -(fooBInt,Expr[Nothing](Test.this.db),42) -fooBBoolean -(fooZString,Expr[Nothing](Test.this.zz),42) -(fooDInt,Expr[Nothing](Test.this.zz),42) -fooZBoolean -(fooBString,Expr[Nothing](Test.this.zd),42) -(fooDInt,Expr[Nothing](Test.this.zd),42) -fooZBoolean -(fooBString,Expr[Nothing](Test.this.zb),42) -(fooBInt,Expr[Nothing](Test.this.zb),42) -fooZBoolean +(fooBString,Expr[Nothing](Test.this.dd),42) +(fooDInt,Expr[Nothing](Test.this.dd),42) +fooBBoolean +(fooBString,Expr[Nothing](Test.this.db),42) +(fooBInt,Expr[Nothing](Test.this.db),42) +fooBBoolean +(fooZString,Expr[Nothing](Test.this.zz),42) +(fooDInt,Expr[Nothing](Test.this.zz),42) +fooZBoolean +(fooBString,Expr[Nothing](Test.this.zd),42) +(fooDInt,Expr[Nothing](Test.this.zd),42) +fooZBoolean +(fooBString,Expr[Nothing](Test.this.zb),42) +(fooBInt,Expr[Nothing](Test.this.zb),42) +fooZBoolean diff --git a/test/files/run/macro-expand-recursive.check b/test/files/run/macro-expand-recursive.check index 1ea14b4e20..7658ad2c24 100644 --- a/test/files/run/macro-expand-recursive.check +++ b/test/files/run/macro-expand-recursive.check @@ -1 +1 @@ -it works +it works diff --git a/test/files/run/macro-expand-tparams-explicit.check b/test/files/run/macro-expand-tparams-explicit.check index 19e6d39bc8..e7e6718406 100644 --- a/test/files/run/macro-expand-tparams-explicit.check +++ b/test/files/run/macro-expand-tparams-explicit.check @@ -1 +1 @@ -TypeTag[Int] +TypeTag[Int] diff --git a/test/files/run/macro-expand-tparams-implicit.check b/test/files/run/macro-expand-tparams-implicit.check index 37226ec68d..fa6b335afb 100644 --- a/test/files/run/macro-expand-tparams-implicit.check +++ b/test/files/run/macro-expand-tparams-implicit.check @@ -1,2 +1,2 @@ -TypeTag[Int] -WeakTypeTag[String] +TypeTag[Int] +WeakTypeTag[String] diff --git a/test/files/run/macro-expand-tparams-optional.check b/test/files/run/macro-expand-tparams-optional.check index 3bacd7a4e0..b4a0f394c1 100644 --- a/test/files/run/macro-expand-tparams-optional.check +++ b/test/files/run/macro-expand-tparams-optional.check @@ -1 +1 @@ -don't know U +don't know U diff --git a/test/files/run/macro-expand-tparams-prefix-a.check b/test/files/run/macro-expand-tparams-prefix-a.check index 7ef9fa7330..0bf3c55bbe 100644 --- a/test/files/run/macro-expand-tparams-prefix-a.check +++ b/test/files/run/macro-expand-tparams-prefix-a.check @@ -1,4 +1,4 @@ -TypeTag[Int] -TypeTag[Int] -WeakTypeTag[String] -TypeTag[Boolean] +TypeTag[Int] +TypeTag[Int] +WeakTypeTag[String] +TypeTag[Boolean] diff --git a/test/files/run/macro-expand-tparams-prefix-b.check b/test/files/run/macro-expand-tparams-prefix-b.check index f4a2a8e80d..77c2ee9051 100644 --- a/test/files/run/macro-expand-tparams-prefix-b.check +++ b/test/files/run/macro-expand-tparams-prefix-b.check @@ -1,2 +1,2 @@ -TypeTag[Boolean] TypeTag[Int] -TypeTag[Boolean] WeakTypeTag[String] +TypeTag[Boolean] TypeTag[Int] +TypeTag[Boolean] WeakTypeTag[String] diff --git a/test/files/run/macro-expand-tparams-prefix-c1.check b/test/files/run/macro-expand-tparams-prefix-c1.check index 473668ac58..f0dd5b9cd8 100644 --- a/test/files/run/macro-expand-tparams-prefix-c1.check +++ b/test/files/run/macro-expand-tparams-prefix-c1.check @@ -1,3 +1,3 @@ -TypeTag[Int] -WeakTypeTag[String] -TypeTag[Boolean] +TypeTag[Int] +WeakTypeTag[String] +TypeTag[Boolean] diff --git a/test/files/run/macro-expand-tparams-prefix-c2.check b/test/files/run/macro-expand-tparams-prefix-c2.check index 473668ac58..f0dd5b9cd8 100644 --- a/test/files/run/macro-expand-tparams-prefix-c2.check +++ b/test/files/run/macro-expand-tparams-prefix-c2.check @@ -1,3 +1,3 @@ -TypeTag[Int] -WeakTypeTag[String] -TypeTag[Boolean] +TypeTag[Int] +WeakTypeTag[String] +TypeTag[Boolean] diff --git a/test/files/run/macro-expand-tparams-prefix-d1.check b/test/files/run/macro-expand-tparams-prefix-d1.check index 2331e2549e..c5aaaf5a09 100644 --- a/test/files/run/macro-expand-tparams-prefix-d1.check +++ b/test/files/run/macro-expand-tparams-prefix-d1.check @@ -1,3 +1,3 @@ -WeakTypeTag[T] -WeakTypeTag[U] -TypeTag[Boolean] +WeakTypeTag[T] +WeakTypeTag[U] +TypeTag[Boolean] diff --git a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check index fd1d654cf8..1c3ecfdefb 100644 --- a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check +++ b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad.check @@ -1,4 +1,4 @@ -reflective compilation has failed: - +reflective compilation has failed: + no `: _*' annotation allowed here -(such annotations are only allowed in arguments to *-parameters) +(such annotations are only allowed in arguments to *-parameters) diff --git a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good.check b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good.check index 835137b4a2..fe90caed3c 100644 --- a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good.check +++ b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good.check @@ -1 +1 @@ -List(1, 2, 3, 4, 5) +List(1, 2, 3, 4, 5) diff --git a/test/files/run/macro-expand-varargs-explicit-over-varargs.check b/test/files/run/macro-expand-varargs-explicit-over-varargs.check index 835137b4a2..fe90caed3c 100644 --- a/test/files/run/macro-expand-varargs-explicit-over-varargs.check +++ b/test/files/run/macro-expand-varargs-explicit-over-varargs.check @@ -1 +1 @@ -List(1, 2, 3, 4, 5) +List(1, 2, 3, 4, 5) diff --git a/test/files/run/macro-expand-varargs-implicit-over-nonvarargs.check b/test/files/run/macro-expand-varargs-implicit-over-nonvarargs.check index 0a6596858c..bcfab19847 100644 --- a/test/files/run/macro-expand-varargs-implicit-over-nonvarargs.check +++ b/test/files/run/macro-expand-varargs-implicit-over-nonvarargs.check @@ -1 +1 @@ -(1,2,3,4,5) +(1,2,3,4,5) diff --git a/test/files/run/macro-expand-varargs-implicit-over-varargs.check b/test/files/run/macro-expand-varargs-implicit-over-varargs.check index f25fa141d3..2c174a8a99 100644 --- a/test/files/run/macro-expand-varargs-implicit-over-varargs.check +++ b/test/files/run/macro-expand-varargs-implicit-over-varargs.check @@ -1 +1 @@ -WrappedArray(1, 2, 3, 4, 5) +WrappedArray(1, 2, 3, 4, 5) diff --git a/test/files/run/macro-impl-default-params.check b/test/files/run/macro-impl-default-params.check index eaf94458e6..b32e345706 100644 --- a/test/files/run/macro-impl-default-params.check +++ b/test/files/run/macro-impl-default-params.check @@ -1,5 +1,5 @@ -foo_targs: -invoking foo_targs... -type of prefix is: Nothing -type of prefix tree is: Macros[Int] -U is: String +foo_targs: +invoking foo_targs... +type of prefix is: Nothing +type of prefix tree is: Macros[Int] +U is: String diff --git a/test/files/run/macro-impl-rename-context.check b/test/files/run/macro-impl-rename-context.check index 753edcd970..6a34e5fd87 100644 --- a/test/files/run/macro-impl-rename-context.check +++ b/test/files/run/macro-impl-rename-context.check @@ -1,2 +1,2 @@ -foo -invoking foo... +foo +invoking foo... diff --git a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype.check b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype.check index e21e05157a..916195145e 100644 --- a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype.check +++ b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype.check @@ -1,5 +1,5 @@ -reflective compilation has failed: - +reflective compilation has failed: + type mismatch; found : String("42") - required: Int + required: Int diff --git a/test/files/run/macro-invalidret-nontypeable.check b/test/files/run/macro-invalidret-nontypeable.check index eee08528e2..cf7acb0d60 100644 --- a/test/files/run/macro-invalidret-nontypeable.check +++ b/test/files/run/macro-invalidret-nontypeable.check @@ -1,3 +1,3 @@ -reflective compilation has failed: - -not found: value IDoNotExist +reflective compilation has failed: + +not found: value IDoNotExist diff --git a/test/files/run/macro-invalidusage-badret.check b/test/files/run/macro-invalidusage-badret.check index 5bdc484644..221732eefc 100644 --- a/test/files/run/macro-invalidusage-badret.check +++ b/test/files/run/macro-invalidusage-badret.check @@ -1,5 +1,5 @@ -reflective compilation has failed: - +reflective compilation has failed: + type mismatch; found : Int(42) - required: String + required: String diff --git a/test/files/run/macro-invalidusage-partialapplication-with-tparams.check b/test/files/run/macro-invalidusage-partialapplication-with-tparams.check index 73f57b0b81..f1d5e925fa 100644 --- a/test/files/run/macro-invalidusage-partialapplication-with-tparams.check +++ b/test/files/run/macro-invalidusage-partialapplication-with-tparams.check @@ -1,3 +1,3 @@ -reflective compilation has failed: - -macros cannot be partially applied +reflective compilation has failed: + +macros cannot be partially applied diff --git a/test/files/run/macro-invalidusage-partialapplication.check b/test/files/run/macro-invalidusage-partialapplication.check index 73f57b0b81..f1d5e925fa 100644 --- a/test/files/run/macro-invalidusage-partialapplication.check +++ b/test/files/run/macro-invalidusage-partialapplication.check @@ -1,3 +1,3 @@ -reflective compilation has failed: - -macros cannot be partially applied +reflective compilation has failed: + +macros cannot be partially applied diff --git a/test/files/run/macro-openmacros.check b/test/files/run/macro-openmacros.check index a4b06a1e1a..ba0ae3ff42 100644 --- a/test/files/run/macro-openmacros.check +++ b/test/files/run/macro-openmacros.check @@ -1,3 +1,3 @@ -List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0)) -List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0)) -List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +2), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0)) +List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0)) +List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0)) +List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +2), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0)) diff --git a/test/files/run/macro-reify-abstypetag-notypeparams.check b/test/files/run/macro-reify-abstypetag-notypeparams.check index aadd713bef..7732c10d75 100644 --- a/test/files/run/macro-reify-abstypetag-notypeparams.check +++ b/test/files/run/macro-reify-abstypetag-notypeparams.check @@ -1,2 +1,2 @@ -TypeTag[Int] -TypeTag[List[Int]] +TypeTag[Int] +TypeTag[List[Int]] diff --git a/test/files/run/macro-reify-abstypetag-typeparams-notags.check b/test/files/run/macro-reify-abstypetag-typeparams-notags.check index 6aeec96079..a741d11ebd 100644 --- a/test/files/run/macro-reify-abstypetag-typeparams-notags.check +++ b/test/files/run/macro-reify-abstypetag-typeparams-notags.check @@ -1,2 +1,2 @@ -WeakTypeTag[T] -WeakTypeTag[List[T]] +WeakTypeTag[T] +WeakTypeTag[List[T]] diff --git a/test/files/run/macro-reify-abstypetag-typeparams-tags.check b/test/files/run/macro-reify-abstypetag-typeparams-tags.check index 6e2646c5e0..e225e57757 100644 --- a/test/files/run/macro-reify-abstypetag-typeparams-tags.check +++ b/test/files/run/macro-reify-abstypetag-typeparams-tags.check @@ -1,2 +1,2 @@ -TypeTag[Int] -WeakTypeTag[List[Int]] +TypeTag[Int] +WeakTypeTag[List[Int]] diff --git a/test/files/run/macro-reify-abstypetag-usetypetag.check b/test/files/run/macro-reify-abstypetag-usetypetag.check index 6e2646c5e0..e225e57757 100644 --- a/test/files/run/macro-reify-abstypetag-usetypetag.check +++ b/test/files/run/macro-reify-abstypetag-usetypetag.check @@ -1,2 +1,2 @@ -TypeTag[Int] -WeakTypeTag[List[Int]] +TypeTag[Int] +WeakTypeTag[List[Int]] diff --git a/test/files/run/macro-reify-basic.check b/test/files/run/macro-reify-basic.check index f35d3e67b4..3b18e512db 100644 --- a/test/files/run/macro-reify-basic.check +++ b/test/files/run/macro-reify-basic.check @@ -1 +1 @@ -hello world +hello world diff --git a/test/files/run/macro-reify-freevars.check b/test/files/run/macro-reify-freevars.check index 2e925f9fa8..f13806889e 100644 --- a/test/files/run/macro-reify-freevars.check +++ b/test/files/run/macro-reify-freevars.check @@ -1,3 +1,3 @@ -reflective compilation has failed: - -Macro expansion contains free term variable code defined by map in Macros_1.scala:9:9. Have you forgotten to use splice when splicing this variable into a reifee? If you have troubles tracking free term variables, consider using -Xlog-free-terms +reflective compilation has failed: + +Macro expansion contains free term variable code defined by map in Macros_1.scala:9:9. Have you forgotten to use splice when splicing this variable into a reifee? If you have troubles tracking free term variables, consider using -Xlog-free-terms diff --git a/test/files/run/macro-reify-ref-to-packageless.check b/test/files/run/macro-reify-ref-to-packageless.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/macro-reify-ref-to-packageless.check +++ b/test/files/run/macro-reify-ref-to-packageless.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/macro-reify-splice-outside-reify.check b/test/files/run/macro-reify-splice-outside-reify.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/macro-reify-splice-outside-reify.check +++ b/test/files/run/macro-reify-splice-outside-reify.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/macro-reify-splice-splice.check b/test/files/run/macro-reify-splice-splice.check index f35d3e67b4..3b18e512db 100644 --- a/test/files/run/macro-reify-splice-splice.check +++ b/test/files/run/macro-reify-splice-splice.check @@ -1 +1 @@ -hello world +hello world diff --git a/test/files/run/macro-reify-tagful-a.check b/test/files/run/macro-reify-tagful-a.check index 8a701df6a5..3f4c719990 100644 --- a/test/files/run/macro-reify-tagful-a.check +++ b/test/files/run/macro-reify-tagful-a.check @@ -1 +1 @@ -List(hello world) +List(hello world) diff --git a/test/files/run/macro-reify-tagless-a.check b/test/files/run/macro-reify-tagless-a.check index c2385ba008..231741edc5 100644 --- a/test/files/run/macro-reify-tagless-a.check +++ b/test/files/run/macro-reify-tagless-a.check @@ -1,3 +1,3 @@ -reflective compilation has failed: - -Macro expansion contains free type variable T defined by foo in Impls_Macros_1.scala:7:13. Have you forgotten to use c.WeakTypeTag annotation for this type parameter? If you have troubles tracking free type variables, consider using -Xlog-free-types +reflective compilation has failed: + +Macro expansion contains free type variable T defined by foo in Impls_Macros_1.scala:7:13. Have you forgotten to use c.WeakTypeTag annotation for this type parameter? If you have troubles tracking free type variables, consider using -Xlog-free-types diff --git a/test/files/run/macro-reify-typetag-notypeparams.check b/test/files/run/macro-reify-typetag-notypeparams.check index aadd713bef..7732c10d75 100644 --- a/test/files/run/macro-reify-typetag-notypeparams.check +++ b/test/files/run/macro-reify-typetag-notypeparams.check @@ -1,2 +1,2 @@ -TypeTag[Int] -TypeTag[List[Int]] +TypeTag[Int] +TypeTag[List[Int]] diff --git a/test/files/run/macro-reify-typetag-typeparams-tags.check b/test/files/run/macro-reify-typetag-typeparams-tags.check index aadd713bef..7732c10d75 100644 --- a/test/files/run/macro-reify-typetag-typeparams-tags.check +++ b/test/files/run/macro-reify-typetag-typeparams-tags.check @@ -1,2 +1,2 @@ -TypeTag[Int] -TypeTag[List[Int]] +TypeTag[Int] +TypeTag[List[Int]] diff --git a/test/files/run/macro-reify-unreify.check b/test/files/run/macro-reify-unreify.check index 8f8d9d944d..7a6d53c47e 100644 --- a/test/files/run/macro-reify-unreify.check +++ b/test/files/run/macro-reify-unreify.check @@ -1 +1 @@ -hello world = Expr[java.lang.String("hello world")]("hello world") +hello world = Expr[java.lang.String("hello world")]("hello world") diff --git a/test/files/run/macro-repl-basic.check b/test/files/run/macro-repl-basic.check index 4a50c60469..7deed4a878 100644 --- a/test/files/run/macro-repl-basic.check +++ b/test/files/run/macro-repl-basic.check @@ -1,54 +1,54 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import language.experimental.macros -import language.experimental.macros - -scala> import scala.reflect.macros.{Context => Ctx} -import scala.reflect.macros.{Context=>Ctx} - -scala> - -scala> object Impls { - def foo(c: Ctx)(x: c.Expr[Int]) = { - import c.universe._ - val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1)))) - c.Expr[Int](body) - } - - def bar(c: Ctx)(x: c.Expr[Int]) = { - import c.universe._ - val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2)))) - c.Expr[Int](body) - } - - def quux(c: Ctx)(x: c.Expr[Int]) = { - import c.universe._ - val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3)))) - c.Expr[Int](body) - } -} -defined module Impls - -scala> object Macros { - object Shmacros { - def foo(x: Int): Int = macro Impls.foo - } - def bar(x: Int): Int = macro Impls.bar -}; class Macros { - def quux(x: Int): Int = macro Impls.quux -} -defined module Macros -defined class Macros - -scala> - -scala> import Macros.Shmacros._ -import Macros.Shmacros._ - -scala> println(foo(2) + Macros.bar(2) * new Macros().quux(4)) -31 - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> import language.experimental.macros +import language.experimental.macros + +scala> import scala.reflect.macros.{Context => Ctx} +import scala.reflect.macros.{Context=>Ctx} + +scala> + +scala> object Impls { + def foo(c: Ctx)(x: c.Expr[Int]) = { + import c.universe._ + val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1)))) + c.Expr[Int](body) + } + + def bar(c: Ctx)(x: c.Expr[Int]) = { + import c.universe._ + val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2)))) + c.Expr[Int](body) + } + + def quux(c: Ctx)(x: c.Expr[Int]) = { + import c.universe._ + val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3)))) + c.Expr[Int](body) + } +} +defined module Impls + +scala> object Macros { + object Shmacros { + def foo(x: Int): Int = macro Impls.foo + } + def bar(x: Int): Int = macro Impls.bar +}; class Macros { + def quux(x: Int): Int = macro Impls.quux +} +defined module Macros +defined class Macros + +scala> + +scala> import Macros.Shmacros._ +import Macros.Shmacros._ + +scala> println(foo(2) + Macros.bar(2) * new Macros().quux(4)) +31 + +scala> diff --git a/test/files/run/macro-repl-dontexpand.check b/test/files/run/macro-repl-dontexpand.check index 3c378cdf09..628a9146c4 100644 --- a/test/files/run/macro-repl-dontexpand.check +++ b/test/files/run/macro-repl-dontexpand.check @@ -1,12 +1,12 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> def bar(c: scala.reflect.macros.Context) = ??? -bar: (c: scala.reflect.macros.Context)Nothing - -scala> def foo = macro bar -foo: Any - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> def bar(c: scala.reflect.macros.Context) = ??? +bar: (c: scala.reflect.macros.Context)Nothing + +scala> def foo = macro bar +foo: Any + +scala> diff --git a/test/files/run/macro-settings.check b/test/files/run/macro-settings.check index 33784d1c15..050d53cdbb 100644 --- a/test/files/run/macro-settings.check +++ b/test/files/run/macro-settings.check @@ -1 +1 @@ -List(hello=1) +List(hello=1) diff --git a/test/files/run/macro-sip19-revised.check b/test/files/run/macro-sip19-revised.check index aa2fbd11d3..86c3d819b0 100644 --- a/test/files/run/macro-sip19-revised.check +++ b/test/files/run/macro-sip19-revised.check @@ -1,5 +1,5 @@ -hey, i've been called from SourceLocation1(null,Test_2.scala,11,251) -hey, i've been called from SourceLocation1(SourceLocation1(null,Test_2.scala,11,251),Test_2.scala,8,222) -hey, i've been called from SourceLocation1(SourceLocation1(SourceLocation1(null,Test_2.scala,11,251),Test_2.scala,8,222),Test_2.scala,8,222) -hey, i've been called from SourceLocation1(SourceLocation1(SourceLocation1(SourceLocation1(null,Test_2.scala,11,251),Test_2.scala,8,222),Test_2.scala,8,222),Test_2.scala,6,180) -2 +hey, i've been called from SourceLocation1(null,Test_2.scala,11,251) +hey, i've been called from SourceLocation1(SourceLocation1(null,Test_2.scala,11,251),Test_2.scala,8,222) +hey, i've been called from SourceLocation1(SourceLocation1(SourceLocation1(null,Test_2.scala,11,251),Test_2.scala,8,222),Test_2.scala,8,222) +hey, i've been called from SourceLocation1(SourceLocation1(SourceLocation1(SourceLocation1(null,Test_2.scala,11,251),Test_2.scala,8,222),Test_2.scala,8,222),Test_2.scala,6,180) +2 diff --git a/test/files/run/macro-sip19.check b/test/files/run/macro-sip19.check index 6b317ccb47..07cfd8c1e1 100644 --- a/test/files/run/macro-sip19.check +++ b/test/files/run/macro-sip19.check @@ -1,5 +1,5 @@ -hey, i've been called from SourceLocation(Test_2.scala,15,366) -hey, i've been called from SourceLocation(Test_2.scala,11,331) -hey, i've been called from SourceLocation(Test_2.scala,11,331) -hey, i've been called from SourceLocation(Test_2.scala,9,285) -2 +hey, i've been called from SourceLocation(Test_2.scala,15,366) +hey, i've been called from SourceLocation(Test_2.scala,11,331) +hey, i've been called from SourceLocation(Test_2.scala,11,331) +hey, i've been called from SourceLocation(Test_2.scala,9,285) +2 diff --git a/test/files/run/macro-typecheck-implicitsdisabled.check b/test/files/run/macro-typecheck-implicitsdisabled.check index aa6c8e1f07..6cf25076a7 100644 --- a/test/files/run/macro-typecheck-implicitsdisabled.check +++ b/test/files/run/macro-typecheck-implicitsdisabled.check @@ -1,2 +1,2 @@ -scala.this.Predef.any2ArrowAssoc[Int](1).->[Int](2) -scala.reflect.internal.Types$TypeError: value -> is not a member of Int +scala.this.Predef.any2ArrowAssoc[Int](1).->[Int](2) +scala.reflect.internal.Types$TypeError: value -> is not a member of Int diff --git a/test/files/run/macro-typecheck-macrosdisabled.check b/test/files/run/macro-typecheck-macrosdisabled.check index c88d33b48e..719c6a2ef2 100644 --- a/test/files/run/macro-typecheck-macrosdisabled.check +++ b/test/files/run/macro-typecheck-macrosdisabled.check @@ -1,32 +1,32 @@ -{ - val $u: reflect.runtime.universe.type = scala.reflect.runtime.`package`.universe; - val $m: $u.Mirror = scala.reflect.runtime.`package`.universe.runtimeMirror(this.getClass().getClassLoader()); - $u.Expr.apply[Int(2)]($m, { - final class $treecreator1 extends TreeCreator { - def (): $treecreator1 = { - $treecreator1.super.(); - () - }; - def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.Literal.apply($u.Constant.apply(2)) - } - }; - new $treecreator1() - })($u.TypeTag.apply[Int(2)]($m, { - final class $typecreator2 extends TypeCreator { - def (): $typecreator2 = { - $typecreator2.super.(); - () - }; - def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.ConstantType.apply($u.Constant.apply(2)) - } - }; - new $typecreator2() - })) -} -ru.reify[Int](2) +{ + val $u: reflect.runtime.universe.type = scala.reflect.runtime.`package`.universe; + val $m: $u.Mirror = scala.reflect.runtime.`package`.universe.runtimeMirror(this.getClass().getClassLoader()); + $u.Expr.apply[Int(2)]($m, { + final class $treecreator1 extends TreeCreator { + def (): $treecreator1 = { + $treecreator1.super.(); + () + }; + def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.Literal.apply($u.Constant.apply(2)) + } + }; + new $treecreator1() + })($u.TypeTag.apply[Int(2)]($m, { + final class $typecreator2 extends TypeCreator { + def (): $typecreator2 = { + $typecreator2.super.(); + () + }; + def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.ConstantType.apply($u.Constant.apply(2)) + } + }; + new $typecreator2() + })) +} +ru.reify[Int](2) diff --git a/test/files/run/macro-typecheck-macrosdisabled2.check b/test/files/run/macro-typecheck-macrosdisabled2.check index 469f41aa94..1fd422083c 100644 --- a/test/files/run/macro-typecheck-macrosdisabled2.check +++ b/test/files/run/macro-typecheck-macrosdisabled2.check @@ -1,32 +1,32 @@ -{ - val $u: reflect.runtime.universe.type = scala.reflect.runtime.`package`.universe; - val $m: $u.Mirror = scala.reflect.runtime.`package`.universe.runtimeMirror(this.getClass().getClassLoader()); - $u.Expr.apply[Array[Int]]($m, { - final class $treecreator1 extends TreeCreator { - def (): $treecreator1 = { - $treecreator1.super.(); - () - }; - def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.Apply.apply($u.Select.apply($u.Select.apply($u.build.Ident($m.staticPackage("scala")), $u.newTermName("Array")), $u.newTermName("apply")), scala.collection.immutable.List.apply[$u.Literal]($u.Literal.apply($u.Constant.apply(2)))) - } - }; - new $treecreator1() - })($u.TypeTag.apply[Array[Int]]($m, { - final class $typecreator2 extends TypeCreator { - def (): $typecreator2 = { - $typecreator2.super.(); - () - }; - def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModule.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asType.toTypeConstructor)) - } - }; - new $typecreator2() - })) -} -ru.reify[Array[Int]](scala.Array.apply(2)) +{ + val $u: reflect.runtime.universe.type = scala.reflect.runtime.`package`.universe; + val $m: $u.Mirror = scala.reflect.runtime.`package`.universe.runtimeMirror(this.getClass().getClassLoader()); + $u.Expr.apply[Array[Int]]($m, { + final class $treecreator1 extends TreeCreator { + def (): $treecreator1 = { + $treecreator1.super.(); + () + }; + def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.Apply.apply($u.Select.apply($u.Select.apply($u.build.Ident($m.staticPackage("scala")), $u.newTermName("Array")), $u.newTermName("apply")), scala.collection.immutable.List.apply[$u.Literal]($u.Literal.apply($u.Constant.apply(2)))) + } + }; + new $treecreator1() + })($u.TypeTag.apply[Array[Int]]($m, { + final class $typecreator2 extends TypeCreator { + def (): $typecreator2 = { + $typecreator2.super.(); + () + }; + def apply[U >: Nothing <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModule.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asType.toTypeConstructor)) + } + }; + new $typecreator2() + })) +} +ru.reify[Array[Int]](scala.Array.apply(2)) diff --git a/test/files/run/macro-undetparams-consfromsls.check b/test/files/run/macro-undetparams-consfromsls.check index 4b83c55437..b10a90043e 100644 --- a/test/files/run/macro-undetparams-consfromsls.check +++ b/test/files/run/macro-undetparams-consfromsls.check @@ -1,5 +1,5 @@ -A = TypeTag[Int] -B = TypeTag[Nothing] -List(1) -A = TypeTag[Any] -List(abc, 1) +A = TypeTag[Int] +B = TypeTag[Nothing] +List(1) +A = TypeTag[Any] +List(abc, 1) diff --git a/test/files/run/macro-undetparams-implicitval.check b/test/files/run/macro-undetparams-implicitval.check index 30681fa40d..541b922b21 100644 --- a/test/files/run/macro-undetparams-implicitval.check +++ b/test/files/run/macro-undetparams-implicitval.check @@ -1 +1 @@ -TypeTag[Nothing] +TypeTag[Nothing] diff --git a/test/files/run/macro-undetparams-macroitself.check b/test/files/run/macro-undetparams-macroitself.check index 37226ec68d..fa6b335afb 100644 --- a/test/files/run/macro-undetparams-macroitself.check +++ b/test/files/run/macro-undetparams-macroitself.check @@ -1,2 +1,2 @@ -TypeTag[Int] -WeakTypeTag[String] +TypeTag[Int] +WeakTypeTag[String] diff --git a/test/files/run/newTags.check b/test/files/run/newTags.check index 0c1bd95eb2..16be9b124e 100644 --- a/test/files/run/newTags.check +++ b/test/files/run/newTags.check @@ -1,3 +1,3 @@ -List[Int] -Map[String,String] -TypeTag[Map[String,String]] +List[Int] +Map[String,String] +TypeTag[Map[String,String]] diff --git a/test/files/run/partialfun.check b/test/files/run/partialfun.check index a317f7b150..d4e9f494cd 100644 --- a/test/files/run/partialfun.check +++ b/test/files/run/partialfun.check @@ -1,6 +1,6 @@ -47 -147 -100 -0:isDefinedAt -1:isDefinedAt -2:apply +47 +147 +100 +0:isDefinedAt +1:isDefinedAt +2:apply diff --git a/test/files/run/partialfun.scala b/test/files/run/partialfun.scala index 4b360750c9..f3c53b94ae 100644 --- a/test/files/run/partialfun.scala +++ b/test/files/run/partialfun.scala @@ -1,86 +1,86 @@ -import collection._ -import collection.generic._ - -object Test { - def collectIDA[A, B, Repr, That](_this: TraversableLike[A, Repr])(pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[Repr, B, That]): That = { - val repr: Repr = _this.asInstanceOf[Repr] - val b = bf(repr) - _this foreach { x => if (pf isDefinedAt x) b += pf(x) } - b.result - } - - def collectRW[A, B, Repr, That](_this: TraversableLike[A, Repr])(pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[Repr, B, That]): That = { - val repr: Repr = _this.asInstanceOf[Repr] - val b = bf(repr) - val f = pf runWith { b += _ } - _this foreach f - b.result - } - - var cnt = 0 - - object Ex1 { - def unapply(x: Int) : Option[Int] = { - cnt += 1 - if ((x % 3) == 0) Some(-x) else None - } - } - - object Ex2 { - def unapply(x: Int) : Option[Int] = { - //cnt += 1 - if ((x % 5) == 0) Some(x) else None - } - } - - def resetCnt() = { val r = cnt; cnt = 0; r } - - val pf: PartialFunction[Int,Int] = { - case Ex1(result) => result - case Ex2(result) => result - } - - def collectTest() { - val xs = 1 to 100 - resetCnt() - - val ysIDA = collectIDA(xs)(pf) - val cntIDA = resetCnt() - - val ysRW = collectRW(xs)(pf) - val cntRW = resetCnt() - - val ys = xs collect pf - - assert(ys == ysIDA) - assert(ys == ysRW) - assert(cntIDA == xs.length + ys.length) - assert(cntRW == xs.length) - println(ys.length) - println(cntIDA) - println(cntRW) - } - - def orElseTest() { - val pf0 = new PartialFunction[Unit, Unit] { - def apply(u: Unit) { println("0:apply") } - def isDefinedAt(u: Unit) = { println("0:isDefinedAt"); false } - } - val pf1 = new PartialFunction[Unit, Unit] { - def apply(u: Unit) { println("1:apply") } - def isDefinedAt(u: Unit) = { println("1:isDefinedAt"); false } - } - val pf2 = new PartialFunction[Unit, Unit] { - def apply(u: Unit) { println("2:apply") } - def isDefinedAt(u: Unit) = { println("2:isDefinedAt"); true } - } - - val chained = pf0 orElse pf1 orElse pf2 - chained() - } - - def main(args: Array[String]): Unit = { - collectTest() - orElseTest() - } -} +import collection._ +import collection.generic._ + +object Test { + def collectIDA[A, B, Repr, That](_this: TraversableLike[A, Repr])(pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[Repr, B, That]): That = { + val repr: Repr = _this.asInstanceOf[Repr] + val b = bf(repr) + _this foreach { x => if (pf isDefinedAt x) b += pf(x) } + b.result + } + + def collectRW[A, B, Repr, That](_this: TraversableLike[A, Repr])(pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[Repr, B, That]): That = { + val repr: Repr = _this.asInstanceOf[Repr] + val b = bf(repr) + val f = pf runWith { b += _ } + _this foreach f + b.result + } + + var cnt = 0 + + object Ex1 { + def unapply(x: Int) : Option[Int] = { + cnt += 1 + if ((x % 3) == 0) Some(-x) else None + } + } + + object Ex2 { + def unapply(x: Int) : Option[Int] = { + //cnt += 1 + if ((x % 5) == 0) Some(x) else None + } + } + + def resetCnt() = { val r = cnt; cnt = 0; r } + + val pf: PartialFunction[Int,Int] = { + case Ex1(result) => result + case Ex2(result) => result + } + + def collectTest() { + val xs = 1 to 100 + resetCnt() + + val ysIDA = collectIDA(xs)(pf) + val cntIDA = resetCnt() + + val ysRW = collectRW(xs)(pf) + val cntRW = resetCnt() + + val ys = xs collect pf + + assert(ys == ysIDA) + assert(ys == ysRW) + assert(cntIDA == xs.length + ys.length) + assert(cntRW == xs.length) + println(ys.length) + println(cntIDA) + println(cntRW) + } + + def orElseTest() { + val pf0 = new PartialFunction[Unit, Unit] { + def apply(u: Unit) { println("0:apply") } + def isDefinedAt(u: Unit) = { println("0:isDefinedAt"); false } + } + val pf1 = new PartialFunction[Unit, Unit] { + def apply(u: Unit) { println("1:apply") } + def isDefinedAt(u: Unit) = { println("1:isDefinedAt"); false } + } + val pf2 = new PartialFunction[Unit, Unit] { + def apply(u: Unit) { println("2:apply") } + def isDefinedAt(u: Unit) = { println("2:isDefinedAt"); true } + } + + val chained = pf0 orElse pf1 orElse pf2 + chained() + } + + def main(args: Array[String]): Unit = { + collectTest() + orElseTest() + } +} diff --git a/test/files/run/primitive-sigs-2-new.check b/test/files/run/primitive-sigs-2-new.check index 6f79d73d38..59d864947c 100644 --- a/test/files/run/primitive-sigs-2-new.check +++ b/test/files/run/primitive-sigs-2-new.check @@ -1,7 +1,7 @@ -T -List(A, char, class java.lang.Object) -a -public java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.ClassTag) -public float[] Arr.arr3(float[][]) -public scala.collection.immutable.List Arr.arr2(java.lang.Character[]) -public scala.collection.immutable.List Arr.arr1(int[]) +T +List(A, char, class java.lang.Object) +a +public java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.ClassTag) +public float[] Arr.arr3(float[][]) +public scala.collection.immutable.List Arr.arr2(java.lang.Character[]) +public scala.collection.immutable.List Arr.arr1(int[]) diff --git a/test/files/run/primitive-sigs-2-old.check b/test/files/run/primitive-sigs-2-old.check index 9132b4d8ae..feb0619525 100644 --- a/test/files/run/primitive-sigs-2-old.check +++ b/test/files/run/primitive-sigs-2-old.check @@ -1,7 +1,7 @@ -T -List(A, char, class java.lang.Object) -a -public java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest) -public float[] Arr.arr3(float[][]) -public scala.collection.immutable.List Arr.arr2(java.lang.Character[]) -public scala.collection.immutable.List Arr.arr1(int[]) +T +List(A, char, class java.lang.Object) +a +public java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest) +public float[] Arr.arr3(float[][]) +public scala.collection.immutable.List Arr.arr2(java.lang.Character[]) +public scala.collection.immutable.List Arr.arr1(int[]) diff --git a/test/files/run/reflection-allmirrors-tostring.check b/test/files/run/reflection-allmirrors-tostring.check index b5fe6c33bb..2a3be29402 100644 --- a/test/files/run/reflection-allmirrors-tostring.check +++ b/test/files/run/reflection-allmirrors-tostring.check @@ -1,14 +1,14 @@ -class mirror for C (bound to null) -module mirror for M (bound to null) -instance mirror for an instance of C -field mirror for C.f1 (bound to an instance of C) -field mirror for C.f2 (bound to an instance of C) -method mirror for C.m1: Int (bound to an instance of C) -method mirror for C.m2(): Int (bound to an instance of C) -method mirror for C.m3[T >: String <: Int]: T (bound to an instance of C) -method mirror for C.m4[A, B <: A[Int]](x: A[B])(implicit y: Int): Nothing (bound to an instance of C) -method mirror for C.m5(x: => Int, y: Int*): String (bound to an instance of C) -class mirror for C.C (bound to an instance of C) -module mirror for C.M (bound to an instance of C) -constructor mirror for C.(): C (bound to null) -constructor mirror for C.C.(): C.this.C (bound to an instance of C) +class mirror for C (bound to null) +module mirror for M (bound to null) +instance mirror for an instance of C +field mirror for C.f1 (bound to an instance of C) +field mirror for C.f2 (bound to an instance of C) +method mirror for C.m1: Int (bound to an instance of C) +method mirror for C.m2(): Int (bound to an instance of C) +method mirror for C.m3[T >: String <: Int]: T (bound to an instance of C) +method mirror for C.m4[A, B <: A[Int]](x: A[B])(implicit y: Int): Nothing (bound to an instance of C) +method mirror for C.m5(x: => Int, y: Int*): String (bound to an instance of C) +class mirror for C.C (bound to an instance of C) +module mirror for C.M (bound to an instance of C) +constructor mirror for C.(): C (bound to null) +constructor mirror for C.C.(): C.this.C (bound to an instance of C) diff --git a/test/files/run/reflection-constructormirror-inner-badpath.check b/test/files/run/reflection-constructormirror-inner-badpath.check index 2fb0610ad6..83852aa80b 100644 --- a/test/files/run/reflection-constructormirror-inner-badpath.check +++ b/test/files/run/reflection-constructormirror-inner-badpath.check @@ -1,2 +1,2 @@ -class R is an inner class, use reflectClass on an InstanceMirror to obtain its ClassMirror -() +class R is an inner class, use reflectClass on an InstanceMirror to obtain its ClassMirror +() diff --git a/test/files/run/reflection-constructormirror-inner-good.check b/test/files/run/reflection-constructormirror-inner-good.check index 811ecb2e3f..d38fb33f97 100644 --- a/test/files/run/reflection-constructormirror-inner-good.check +++ b/test/files/run/reflection-constructormirror-inner-good.check @@ -1 +1 @@ -R(5,test) +R(5,test) diff --git a/test/files/run/reflection-constructormirror-nested-badpath.check b/test/files/run/reflection-constructormirror-nested-badpath.check index acd21df9c0..4c65b8a58b 100644 --- a/test/files/run/reflection-constructormirror-nested-badpath.check +++ b/test/files/run/reflection-constructormirror-nested-badpath.check @@ -1,2 +1,2 @@ -class R is a static class, use reflectClass on a RuntimeMirror to obtain its ClassMirror -() +class R is a static class, use reflectClass on a RuntimeMirror to obtain its ClassMirror +() diff --git a/test/files/run/reflection-constructormirror-nested-good.check b/test/files/run/reflection-constructormirror-nested-good.check index 811ecb2e3f..d38fb33f97 100644 --- a/test/files/run/reflection-constructormirror-nested-good.check +++ b/test/files/run/reflection-constructormirror-nested-good.check @@ -1 +1 @@ -R(5,test) +R(5,test) diff --git a/test/files/run/reflection-constructormirror-toplevel-badpath.check b/test/files/run/reflection-constructormirror-toplevel-badpath.check index acd21df9c0..4c65b8a58b 100644 --- a/test/files/run/reflection-constructormirror-toplevel-badpath.check +++ b/test/files/run/reflection-constructormirror-toplevel-badpath.check @@ -1,2 +1,2 @@ -class R is a static class, use reflectClass on a RuntimeMirror to obtain its ClassMirror -() +class R is a static class, use reflectClass on a RuntimeMirror to obtain its ClassMirror +() diff --git a/test/files/run/reflection-constructormirror-toplevel-good.check b/test/files/run/reflection-constructormirror-toplevel-good.check index 811ecb2e3f..d38fb33f97 100644 --- a/test/files/run/reflection-constructormirror-toplevel-good.check +++ b/test/files/run/reflection-constructormirror-toplevel-good.check @@ -1 +1 @@ -R(5,test) +R(5,test) diff --git a/test/files/run/reflection-enclosed-basic.check b/test/files/run/reflection-enclosed-basic.check index 41f6a72f1c..6210b42ea5 100644 --- a/test/files/run/reflection-enclosed-basic.check +++ b/test/files/run/reflection-enclosed-basic.check @@ -1,18 +1,18 @@ -class B1 -B1 -1 -class B2 -B2 -2 -object B3 -B3 -3 -object B4 -B4 -4 -object B5 -B5 -5 -object B6 -B6 -6 +class B1 +B1 +1 +class B2 +B2 +2 +object B3 +B3 +3 +object B4 +B4 +4 +object B5 +B5 +5 +object B6 +B6 +6 diff --git a/test/files/run/reflection-enclosed-inner-basic.check b/test/files/run/reflection-enclosed-inner-basic.check index 984fb1ff12..2496ee407b 100644 --- a/test/files/run/reflection-enclosed-inner-basic.check +++ b/test/files/run/reflection-enclosed-inner-basic.check @@ -1,20 +1,20 @@ -class B -List(constructor B, class B1, class B2, object B3, object B4, object B5, object B6) -class B1 -B1 -1 -class B2 -B2 -2 -object B3 -B3 -3 -object B4 -B4 -4 -object B5 -B5 -5 -object B6 -B6 -6 +class B +List(constructor B, class B1, class B2, object B3, object B4, object B5, object B6) +class B1 +B1 +1 +class B2 +B2 +2 +object B3 +B3 +3 +object B4 +B4 +4 +object B5 +B5 +5 +object B6 +B6 +6 diff --git a/test/files/run/reflection-enclosed-inner-inner-basic.check b/test/files/run/reflection-enclosed-inner-inner-basic.check index 8987f31b18..add7a81c0a 100644 --- a/test/files/run/reflection-enclosed-inner-inner-basic.check +++ b/test/files/run/reflection-enclosed-inner-inner-basic.check @@ -1,20 +1,20 @@ -class BB -List(constructor BB, class B1, class B2, object B3, object B4, object B5, object B6) -class B1 -B1 -1 -class B2 -B2 -2 -object B3 -B3 -3 -object B4 -B4 -4 -object B5 -B5 -5 -object B6 -B6 -6 +class BB +List(constructor BB, class B1, class B2, object B3, object B4, object B5, object B6) +class B1 +B1 +1 +class B2 +B2 +2 +object B3 +B3 +3 +object B4 +B4 +4 +object B5 +B5 +5 +object B6 +B6 +6 diff --git a/test/files/run/reflection-fieldmirror-accessorsareokay.check b/test/files/run/reflection-fieldmirror-accessorsareokay.check index 635dcd04ce..e6936c8acc 100644 --- a/test/files/run/reflection-fieldmirror-accessorsareokay.check +++ b/test/files/run/reflection-fieldmirror-accessorsareokay.check @@ -1,6 +1,6 @@ -true -42 -2 -true -2 -2 +true +42 +2 +true +2 +2 diff --git a/test/files/run/reflection-fieldmirror-ctorparam.check b/test/files/run/reflection-fieldmirror-ctorparam.check index 31f6491b14..e391e7ccfe 100644 --- a/test/files/run/reflection-fieldmirror-ctorparam.check +++ b/test/files/run/reflection-fieldmirror-ctorparam.check @@ -1,3 +1,3 @@ class scala.ScalaReflectionException: Scala field x isn't represented as a Java field, neither it has a Java accessor method note that private parameters of class constructors don't get mapped onto fields and/or accessors, -unless they are used outside of their declaring constructors. +unless they are used outside of their declaring constructors. diff --git a/test/files/run/reflection-fieldmirror-getsetval.check b/test/files/run/reflection-fieldmirror-getsetval.check index e1927f68d0..82fef37c25 100644 --- a/test/files/run/reflection-fieldmirror-getsetval.check +++ b/test/files/run/reflection-fieldmirror-getsetval.check @@ -1,2 +1,2 @@ -42 -cannot set an immutable field x +42 +cannot set an immutable field x diff --git a/test/files/run/reflection-fieldmirror-getsetvar.check b/test/files/run/reflection-fieldmirror-getsetvar.check index a9b0ccc6a0..1e959a9900 100644 --- a/test/files/run/reflection-fieldmirror-getsetvar.check +++ b/test/files/run/reflection-fieldmirror-getsetvar.check @@ -1,2 +1,2 @@ -42 -2 +42 +2 diff --git a/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.check b/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.check index fe75c80bca..27ba77ddaf 100644 --- a/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.check +++ b/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.check @@ -1 +1 @@ -true +true diff --git a/test/files/run/reflection-fieldmirror-privatethis.check b/test/files/run/reflection-fieldmirror-privatethis.check index 889b7c2c34..16010115e1 100644 --- a/test/files/run/reflection-fieldmirror-privatethis.check +++ b/test/files/run/reflection-fieldmirror-privatethis.check @@ -1,3 +1,3 @@ -true -42 -2 +true +42 +2 diff --git a/test/files/run/reflection-fieldsymbol-navigation.check b/test/files/run/reflection-fieldsymbol-navigation.check index 79f0928ea5..ae0597a045 100644 --- a/test/files/run/reflection-fieldsymbol-navigation.check +++ b/test/files/run/reflection-fieldsymbol-navigation.check @@ -1,6 +1,6 @@ -method x -false -variable x -true -method x -method x_= +method x +false +variable x +true +method x +method x_= diff --git a/test/files/run/reflection-implicit.check b/test/files/run/reflection-implicit.check index bab1518c45..5a88a46f0b 100644 --- a/test/files/run/reflection-implicit.check +++ b/test/files/run/reflection-implicit.check @@ -1,2 +1,2 @@ -List(true, true, true, true) -true +List(true, true, true, true) +true diff --git a/test/files/run/reflection-magicsymbols-invoke.check b/test/files/run/reflection-magicsymbols-invoke.check index bef492eb54..520dc2bfbe 100644 --- a/test/files/run/reflection-magicsymbols-invoke.check +++ b/test/files/run/reflection-magicsymbols-invoke.check @@ -1,124 +1,124 @@ ============ -Any -it's important to print the list of Any's members -if some of them change (possibly, adding and/or removing magic symbols), we must update this test -method !=: (x$1: Any)Boolean -method ##: ()Int -method ==: (x$1: Any)Boolean -method asInstanceOf: [T0]=> T0 -method equals: (x$1: Any)Boolean -method getClass: ()java.lang.Class[_] -method hashCode: ()Int -method isInstanceOf: [T0]=> Boolean -method toString: ()java.lang.String -testing Any.!=: false -testing Any.##: 50 -testing Any.==: true -testing Any.asInstanceOf: class scala.ScalaReflectionException: Any.asInstanceOf requires a type argument, it cannot be invoked with mirrors -testing Any.asInstanceOf: class scala.ScalaReflectionException: scala.Any.asInstanceOf[T0]: T0 takes 0 arguments -testing Any.equals: true -testing Any.getClass: class java.lang.String -testing Any.hashCode: 50 -testing Any.isInstanceOf: class scala.ScalaReflectionException: Any.isInstanceOf requires a type argument, it cannot be invoked with mirrors -testing Any.isInstanceOf: class scala.ScalaReflectionException: scala.Any.isInstanceOf[T0]: Boolean takes 0 arguments -testing Any.toString: 2 +Any +it's important to print the list of Any's members +if some of them change (possibly, adding and/or removing magic symbols), we must update this test +method !=: (x$1: Any)Boolean +method ##: ()Int +method ==: (x$1: Any)Boolean +method asInstanceOf: [T0]=> T0 +method equals: (x$1: Any)Boolean +method getClass: ()java.lang.Class[_] +method hashCode: ()Int +method isInstanceOf: [T0]=> Boolean +method toString: ()java.lang.String +testing Any.!=: false +testing Any.##: 50 +testing Any.==: true +testing Any.asInstanceOf: class scala.ScalaReflectionException: Any.asInstanceOf requires a type argument, it cannot be invoked with mirrors +testing Any.asInstanceOf: class scala.ScalaReflectionException: scala.Any.asInstanceOf[T0]: T0 takes 0 arguments +testing Any.equals: true +testing Any.getClass: class java.lang.String +testing Any.hashCode: 50 +testing Any.isInstanceOf: class scala.ScalaReflectionException: Any.isInstanceOf requires a type argument, it cannot be invoked with mirrors +testing Any.isInstanceOf: class scala.ScalaReflectionException: scala.Any.isInstanceOf[T0]: Boolean takes 0 arguments +testing Any.toString: 2 ============ -AnyVal -it's important to print the list of AnyVal's members -if some of them change (possibly, adding and/or removing magic symbols), we must update this test -constructor AnyVal: ()AnyVal -method getClass: ()Class[_ <: AnyVal] -testing AnyVal.: class java.lang.InstantiationException: null -testing AnyVal.getClass: class scala.ScalaReflectionException: expected a member of class Integer, you provided method scala.AnyVal.getClass +AnyVal +it's important to print the list of AnyVal's members +if some of them change (possibly, adding and/or removing magic symbols), we must update this test +constructor AnyVal: ()AnyVal +method getClass: ()Class[_ <: AnyVal] +testing AnyVal.: class java.lang.InstantiationException: null +testing AnyVal.getClass: class scala.ScalaReflectionException: expected a member of class Integer, you provided method scala.AnyVal.getClass ============ -AnyRef -it's important to print the list of AnyRef's members -if some of them change (possibly, adding and/or removing magic symbols), we must update this test -constructor Object: ()java.lang.Object -method !=: (x$1: Any)Boolean -method !=: (x$1: AnyRef)Boolean -method ##: ()Int -method $asInstanceOf: [T0]()T0 -method $isInstanceOf: [T0]()Boolean -method ==: (x$1: Any)Boolean -method ==: (x$1: AnyRef)Boolean -method asInstanceOf: [T0]=> T0 -method clone: ()java.lang.Object -method eq: (x$1: AnyRef)Boolean -method equals: (x$1: Any)Boolean -method finalize: ()Unit -method getClass: ()java.lang.Class[_] -method hashCode: ()Int -method isInstanceOf: [T0]=> Boolean -method ne: (x$1: AnyRef)Boolean -method notify: ()Unit -method notifyAll: ()Unit -method synchronized: [T0](x$1: T0)T0 -method toString: ()java.lang.String -method wait: ()Unit -method wait: (x$1: Long)Unit -method wait: (x$1: Long, x$2: Int)Unit -testing Object.!=: false -testing Object.##: 50 -testing Object.$asInstanceOf: class scala.ScalaReflectionException: AnyRef.$asInstanceOf is an internal method, it cannot be invoked with mirrors -testing Object.$asInstanceOf: class scala.ScalaReflectionException: java.lang.Object.$asInstanceOf[T0](): T0 takes 0 arguments -testing Object.$isInstanceOf: class scala.ScalaReflectionException: AnyRef.$isInstanceOf is an internal method, it cannot be invoked with mirrors -testing Object.$isInstanceOf: class scala.ScalaReflectionException: java.lang.Object.$isInstanceOf[T0](): Boolean takes 0 arguments -testing Object.==: true -testing Object.clone: class java.lang.CloneNotSupportedException: java.lang.String -testing Object.eq: true -testing Object.equals: true -testing Object.finalize: () -testing Object.getClass: class java.lang.String -testing Object.hashCode: 50 -testing Object.ne: false -testing Object.notify: class java.lang.IllegalMonitorStateException: null -testing Object.notifyAll: class java.lang.IllegalMonitorStateException: null -testing Object.synchronized: 2 -testing Object.toString: 2 -TODO: also test AnyRef.wait overloads +AnyRef +it's important to print the list of AnyRef's members +if some of them change (possibly, adding and/or removing magic symbols), we must update this test +constructor Object: ()java.lang.Object +method !=: (x$1: Any)Boolean +method !=: (x$1: AnyRef)Boolean +method ##: ()Int +method $asInstanceOf: [T0]()T0 +method $isInstanceOf: [T0]()Boolean +method ==: (x$1: Any)Boolean +method ==: (x$1: AnyRef)Boolean +method asInstanceOf: [T0]=> T0 +method clone: ()java.lang.Object +method eq: (x$1: AnyRef)Boolean +method equals: (x$1: Any)Boolean +method finalize: ()Unit +method getClass: ()java.lang.Class[_] +method hashCode: ()Int +method isInstanceOf: [T0]=> Boolean +method ne: (x$1: AnyRef)Boolean +method notify: ()Unit +method notifyAll: ()Unit +method synchronized: [T0](x$1: T0)T0 +method toString: ()java.lang.String +method wait: ()Unit +method wait: (x$1: Long)Unit +method wait: (x$1: Long, x$2: Int)Unit +testing Object.!=: false +testing Object.##: 50 +testing Object.$asInstanceOf: class scala.ScalaReflectionException: AnyRef.$asInstanceOf is an internal method, it cannot be invoked with mirrors +testing Object.$asInstanceOf: class scala.ScalaReflectionException: java.lang.Object.$asInstanceOf[T0](): T0 takes 0 arguments +testing Object.$isInstanceOf: class scala.ScalaReflectionException: AnyRef.$isInstanceOf is an internal method, it cannot be invoked with mirrors +testing Object.$isInstanceOf: class scala.ScalaReflectionException: java.lang.Object.$isInstanceOf[T0](): Boolean takes 0 arguments +testing Object.==: true +testing Object.clone: class java.lang.CloneNotSupportedException: java.lang.String +testing Object.eq: true +testing Object.equals: true +testing Object.finalize: () +testing Object.getClass: class java.lang.String +testing Object.hashCode: 50 +testing Object.ne: false +testing Object.notify: class java.lang.IllegalMonitorStateException: null +testing Object.notifyAll: class java.lang.IllegalMonitorStateException: null +testing Object.synchronized: 2 +testing Object.toString: 2 +TODO: also test AnyRef.wait overloads ============ -Array -it's important to print the list of Array's members -if some of them change (possibly, adding and/or removing magic symbols), we must update this test -constructor Array: (_length: Int)Array[T] -constructor Object: ()java.lang.Object -method !=: (x$1: Any)Boolean -method !=: (x$1: AnyRef)Boolean -method ##: ()Int -method $asInstanceOf: [T0]()T0 -method $isInstanceOf: [T0]()Boolean -method ==: (x$1: Any)Boolean -method ==: (x$1: AnyRef)Boolean -method apply: (i: )T -method asInstanceOf: [T0]=> T0 -method clone: ()Array[T] -method eq: (x$1: AnyRef)Boolean -method equals: (x$1: Any)Boolean -method finalize: ()Unit -method getClass: ()java.lang.Class[_] -method hashCode: ()Int -method isInstanceOf: [T0]=> Boolean -method length: => Int -method ne: (x$1: AnyRef)Boolean -method notify: ()Unit -method notifyAll: ()Unit -method synchronized: [T0](x$1: T0)T0 -method toString: ()java.lang.String -method update: (i: , x: )Unit -method wait: ()Unit -method wait: (x$1: Long)Unit -method wait: (x$1: Long, x$2: Int)Unit -value _length: Int -testing Array.length: 2 -testing Array.apply: 1 -testing Array.update: () -testing Array.clone: List(1, 2) +Array +it's important to print the list of Array's members +if some of them change (possibly, adding and/or removing magic symbols), we must update this test +constructor Array: (_length: Int)Array[T] +constructor Object: ()java.lang.Object +method !=: (x$1: Any)Boolean +method !=: (x$1: AnyRef)Boolean +method ##: ()Int +method $asInstanceOf: [T0]()T0 +method $isInstanceOf: [T0]()Boolean +method ==: (x$1: Any)Boolean +method ==: (x$1: AnyRef)Boolean +method apply: (i: )T +method asInstanceOf: [T0]=> T0 +method clone: ()Array[T] +method eq: (x$1: AnyRef)Boolean +method equals: (x$1: Any)Boolean +method finalize: ()Unit +method getClass: ()java.lang.Class[_] +method hashCode: ()Int +method isInstanceOf: [T0]=> Boolean +method length: => Int +method ne: (x$1: AnyRef)Boolean +method notify: ()Unit +method notifyAll: ()Unit +method synchronized: [T0](x$1: T0)T0 +method toString: ()java.lang.String +method update: (i: , x: )Unit +method wait: ()Unit +method wait: (x$1: Long)Unit +method wait: (x$1: Long, x$2: Int)Unit +value _length: Int +testing Array.length: 2 +testing Array.apply: 1 +testing Array.update: () +testing Array.clone: List(1, 2) ============ -Other -testing String.+: 23 +Other +testing String.+: 23 ============ -CTM -testing Predef.classOf: class scala.ScalaReflectionException: Predef.classOf is a compile-time function, it cannot be invoked with mirrors -testing Predef.classOf: class scala.ScalaReflectionException: scala.Predef.classOf[T]: Class[T] takes 0 arguments -testing Universe.reify: class scala.ScalaReflectionException: scala.reflect.api.Universe.reify is a macro, i.e. a compile-time function, it cannot be invoked with mirrors +CTM +testing Predef.classOf: class scala.ScalaReflectionException: Predef.classOf is a compile-time function, it cannot be invoked with mirrors +testing Predef.classOf: class scala.ScalaReflectionException: scala.Predef.classOf[T]: Class[T] takes 0 arguments +testing Universe.reify: class scala.ScalaReflectionException: scala.reflect.api.Universe.reify is a macro, i.e. a compile-time function, it cannot be invoked with mirrors diff --git a/test/files/run/reflection-magicsymbols-repl.check b/test/files/run/reflection-magicsymbols-repl.check index d2ef4ad3cd..d3cd26f25f 100644 --- a/test/files/run/reflection-magicsymbols-repl.check +++ b/test/files/run/reflection-magicsymbols-repl.check @@ -1,39 +1,39 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import scala.reflect.runtime.universe._ -import scala.reflect.runtime.universe._ - -scala> class A { - def foo1(x: Int*) = ??? - def foo2(x: => Int) = ??? - def foo3(x: Any) = ??? - def foo4(x: AnyRef) = ??? - def foo5(x: AnyVal) = ??? - def foo6(x: Null) = ??? - def foo7(x: Nothing) = ??? - def foo8(x: Singleton) = ??? -} -defined class A - -scala> def test(n: Int): Unit = { - val sig = typeOf[A] member newTermName("foo" + n) typeSignature - val x = sig.asInstanceOf[MethodType].params.head - println(x.typeSignature) -} -warning: there were 1 feature warnings; re-run with -feature for details -test: (n: Int)Unit - -scala> for (i <- 1 to 8) test(i) -scala.Int* -=> scala.Int -scala.Any -scala.AnyRef -scala.AnyVal -scala.Null -scala.Nothing -scala.Singleton - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> import scala.reflect.runtime.universe._ +import scala.reflect.runtime.universe._ + +scala> class A { + def foo1(x: Int*) = ??? + def foo2(x: => Int) = ??? + def foo3(x: Any) = ??? + def foo4(x: AnyRef) = ??? + def foo5(x: AnyVal) = ??? + def foo6(x: Null) = ??? + def foo7(x: Nothing) = ??? + def foo8(x: Singleton) = ??? +} +defined class A + +scala> def test(n: Int): Unit = { + val sig = typeOf[A] member newTermName("foo" + n) typeSignature + val x = sig.asInstanceOf[MethodType].params.head + println(x.typeSignature) +} +warning: there were 1 feature warnings; re-run with -feature for details +test: (n: Int)Unit + +scala> for (i <- 1 to 8) test(i) +scala.Int* +=> scala.Int +scala.Any +scala.AnyRef +scala.AnyVal +scala.Null +scala.Nothing +scala.Singleton + +scala> diff --git a/test/files/run/reflection-magicsymbols-vanilla.check b/test/files/run/reflection-magicsymbols-vanilla.check index 4f4e8d94a9..d3ff152896 100644 --- a/test/files/run/reflection-magicsymbols-vanilla.check +++ b/test/files/run/reflection-magicsymbols-vanilla.check @@ -1,8 +1,8 @@ -Int* -=> Int -Any -AnyRef -AnyVal -Null -Nothing -Singleton +Int* +=> Int +Any +AnyRef +AnyVal +Null +Nothing +Singleton diff --git a/test/files/run/reflection-methodsymbol-params.check b/test/files/run/reflection-methodsymbol-params.check index 11f349d52b..554e72d553 100644 --- a/test/files/run/reflection-methodsymbol-params.check +++ b/test/files/run/reflection-methodsymbol-params.check @@ -1,8 +1,8 @@ -List() -List(List()) -List(List(value x)) -List(List(value x), List(value y)) -List() -List(List()) -List(List(value x)) -List(List(value x), List(value y)) +List() +List(List()) +List(List(value x)) +List(List(value x), List(value y)) +List() +List(List()) +List(List(value x)) +List(List(value x), List(value y)) diff --git a/test/files/run/reflection-methodsymbol-returntype.check b/test/files/run/reflection-methodsymbol-returntype.check index 0f30d1beaf..97ea02956d 100644 --- a/test/files/run/reflection-methodsymbol-returntype.check +++ b/test/files/run/reflection-methodsymbol-returntype.check @@ -1,8 +1,8 @@ -Int -Int -Int -Int -Int -Int -Int -Int +Int +Int +Int +Int +Int +Int +Int +Int diff --git a/test/files/run/reflection-methodsymbol-typeparams.check b/test/files/run/reflection-methodsymbol-typeparams.check index c888e09a17..f04188775c 100644 --- a/test/files/run/reflection-methodsymbol-typeparams.check +++ b/test/files/run/reflection-methodsymbol-typeparams.check @@ -1,8 +1,8 @@ -List() -List() -List() -List() -List(type T) -List(type T) -List(type T) -List(type T) +List() +List() +List() +List() +List(type T) +List(type T) +List(type T) +List(type T) diff --git a/test/files/run/reflection-modulemirror-inner-badpath.check b/test/files/run/reflection-modulemirror-inner-badpath.check index 1e990ec900..a8e7397c8f 100644 --- a/test/files/run/reflection-modulemirror-inner-badpath.check +++ b/test/files/run/reflection-modulemirror-inner-badpath.check @@ -1,2 +1,2 @@ -object R is an inner module, use reflectModule on an InstanceMirror to obtain its ModuleMirror -() +object R is an inner module, use reflectModule on an InstanceMirror to obtain its ModuleMirror +() diff --git a/test/files/run/reflection-modulemirror-inner-good.check b/test/files/run/reflection-modulemirror-inner-good.check index fe658e7087..331bae08fb 100644 --- a/test/files/run/reflection-modulemirror-inner-good.check +++ b/test/files/run/reflection-modulemirror-inner-good.check @@ -1 +1 @@ -R +R diff --git a/test/files/run/reflection-modulemirror-nested-badpath.check b/test/files/run/reflection-modulemirror-nested-badpath.check index f7980b9986..3ef94e1ec6 100644 --- a/test/files/run/reflection-modulemirror-nested-badpath.check +++ b/test/files/run/reflection-modulemirror-nested-badpath.check @@ -1,2 +1,2 @@ -object R is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror -() +object R is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror +() diff --git a/test/files/run/reflection-modulemirror-nested-good.check b/test/files/run/reflection-modulemirror-nested-good.check index fe658e7087..331bae08fb 100644 --- a/test/files/run/reflection-modulemirror-nested-good.check +++ b/test/files/run/reflection-modulemirror-nested-good.check @@ -1 +1 @@ -R +R diff --git a/test/files/run/reflection-modulemirror-toplevel-badpath.check b/test/files/run/reflection-modulemirror-toplevel-badpath.check index f7980b9986..3ef94e1ec6 100644 --- a/test/files/run/reflection-modulemirror-toplevel-badpath.check +++ b/test/files/run/reflection-modulemirror-toplevel-badpath.check @@ -1,2 +1,2 @@ -object R is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror -() +object R is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror +() diff --git a/test/files/run/reflection-repl-classes.check b/test/files/run/reflection-repl-classes.check index 1c7f86c90c..2dd96a93bf 100644 --- a/test/files/run/reflection-repl-classes.check +++ b/test/files/run/reflection-repl-classes.check @@ -1,35 +1,35 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> class A -defined class A - -scala> - -scala> class B { - def foo(x: A) = 1 -} -defined class B - -scala> - -scala> object defs { - val cm = reflect.runtime.currentMirror - val u = cm.universe - val im = cm.reflect(new B) - val method = im.symbol.typeSignature.member(u.newTermName("foo")).asMethod - val mm = im.reflectMethod(method) -} -defined module defs - -scala> import defs._ -import defs._ - -scala> - -scala> mm(new A) -res0: Any = 1 - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> class A +defined class A + +scala> + +scala> class B { + def foo(x: A) = 1 +} +defined class B + +scala> + +scala> object defs { + val cm = reflect.runtime.currentMirror + val u = cm.universe + val im = cm.reflect(new B) + val method = im.symbol.typeSignature.member(u.newTermName("foo")).asMethod + val mm = im.reflectMethod(method) +} +defined module defs + +scala> import defs._ +import defs._ + +scala> + +scala> mm(new A) +res0: Any = 1 + +scala> diff --git a/test/files/run/reflection-repl-elementary.check b/test/files/run/reflection-repl-elementary.check index 341dd10ab0..d9133f7e3e 100644 --- a/test/files/run/reflection-repl-elementary.check +++ b/test/files/run/reflection-repl-elementary.check @@ -1,9 +1,9 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> scala.reflect.runtime.universe.typeOf[List[Nothing]] -res0: reflect.runtime.universe.Type = scala.List[Nothing] - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> scala.reflect.runtime.universe.typeOf[List[Nothing]] +res0: reflect.runtime.universe.Type = scala.List[Nothing] + +scala> diff --git a/test/files/run/reflection-sorted-decls.check b/test/files/run/reflection-sorted-decls.check index 02168c4e5f..415e073149 100644 --- a/test/files/run/reflection-sorted-decls.check +++ b/test/files/run/reflection-sorted-decls.check @@ -1,3 +1,3 @@ -value a -value b -value c +value a +value b +value c diff --git a/test/files/run/reflection-sorted-members.check b/test/files/run/reflection-sorted-members.check index bb85b5a13c..c148e19e69 100644 --- a/test/files/run/reflection-sorted-members.check +++ b/test/files/run/reflection-sorted-members.check @@ -1,4 +1,4 @@ -value a -value b -value c -value x +value a +value b +value c +value x diff --git a/test/files/run/reflection-valueclasses-derived.check b/test/files/run/reflection-valueclasses-derived.check index bfcfcade5e..3382d41556 100644 --- a/test/files/run/reflection-valueclasses-derived.check +++ b/test/files/run/reflection-valueclasses-derived.check @@ -1,3 +1,3 @@ -4 -class C -C@2 +4 +class C +C@2 diff --git a/test/files/run/reflection-valueclasses-standard.check b/test/files/run/reflection-valueclasses-standard.check index 060ab55406..643c3d048c 100644 --- a/test/files/run/reflection-valueclasses-standard.check +++ b/test/files/run/reflection-valueclasses-standard.check @@ -1,27 +1,27 @@ -========byte======== -byte -2 -========short======== -short -2 -========int======== -int -2 -========long======== -long -2 -========float======== -float -2.0 -========double======== -double -2.0 -========char======== -char -2 -========boolean======== -boolean -true -========void======== -void -() +========byte======== +byte +2 +========short======== +short +2 +========int======== +int +2 +========long======== +long +2 +========float======== +float +2.0 +========double======== +double +2.0 +========char======== +char +2 +========boolean======== +boolean +true +========void======== +void +() diff --git a/test/files/run/reify-aliases.check b/test/files/run/reify-aliases.check index 392dd59a1d..aa846b9bc6 100644 --- a/test/files/run/reify-aliases.check +++ b/test/files/run/reify-aliases.check @@ -1 +1 @@ -TypeRef(SingleType(ThisType(scala), scala.Predef), newTypeName("String"), List()) +TypeRef(SingleType(ThisType(scala), scala.Predef), newTypeName("String"), List()) diff --git a/test/files/run/reify-repl-fail-gracefully.check b/test/files/run/reify-repl-fail-gracefully.check index 5a97983e54..1b0f3f2162 100644 --- a/test/files/run/reify-repl-fail-gracefully.check +++ b/test/files/run/reify-repl-fail-gracefully.check @@ -1,21 +1,21 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import language.experimental.macros -import language.experimental.macros - -scala> import scala.reflect.runtime.universe._ -import scala.reflect.runtime.universe._ - -scala> - -scala> reify -:12: error: macros cannot be partially applied - reify - ^ - -scala> - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> import language.experimental.macros +import language.experimental.macros + +scala> import scala.reflect.runtime.universe._ +import scala.reflect.runtime.universe._ + +scala> + +scala> reify +:12: error: macros cannot be partially applied + reify + ^ + +scala> + +scala> diff --git a/test/files/run/reify-staticXXX.check b/test/files/run/reify-staticXXX.check index 5762ec47d6..37102b29e1 100644 --- a/test/files/run/reify-staticXXX.check +++ b/test/files/run/reify-staticXXX.check @@ -1,24 +1,24 @@ -object -object -class -class -object > object -object > object -object > class -object > class -package > object -package > object -package > class -package > class -object -object -class -class -object > object -object > object -object > class -object > class -package > object -package > object -package > class -package > class +object +object +class +class +object > object +object > object +object > class +object > class +package > object +package > object +package > class +package > class +object +object +class +class +object > object +object > object +object > class +object > class +package > object +package > object +package > class +package > class diff --git a/test/files/run/reify_ann1a.check b/test/files/run/reify_ann1a.check index 9bbb0ab87a..244be27aa7 100644 --- a/test/files/run/reify_ann1a.check +++ b/test/files/run/reify_ann1a.check @@ -1,30 +1,30 @@ -{ - @new ann(immutable.this.List.apply("1a")) @new ann(immutable.this.List.apply("1b")) class C[@new ann(immutable.this.List.apply("2a")) @new ann(immutable.this.List.apply("2b")) T >: Nothing <: Any] extends AnyRef { - @new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) private[this] val x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b")) = _; - def (@new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b"))) = { - super.(); - () - }; - @new ann(immutable.this.List.apply("5a")) @new ann(immutable.this.List.apply("5b")) def f(x: Int @ann(immutable.this.List.apply("6a")) @ann(immutable.this.List.apply("6b"))) = { - @new ann(immutable.this.List.apply("7a")) @new ann(immutable.this.List.apply("7b")) val r = x.$plus(3): @ann(immutable.this.List.apply("8a")): @ann(immutable.this.List.apply("8b")); - val s = (4: Int @ann(immutable.this.List.apply("9a")) @ann(immutable.this.List.apply("9b"))); - r.$plus(s) - } - }; - () -} -{ - @ann(immutable.this.List.apply[String]("1a")) @ann(immutable.this.List.apply[String]("1b")) class C[@ann(immutable.this.List.apply[String]("2a")) @ann(immutable.this.List.apply[String]("2b")) T] extends AnyRef { - @ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) private[this] val x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a")) = _; - def (@ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a"))): C[T] = { - C.super.(); - () - }; - @ann(immutable.this.List.apply[String]("5a")) @ann(immutable.this.List.apply[String]("5b")) def f(x: Int @ann(immutable.this.List.apply[String]("6b")) @ann(immutable.this.List.apply[String]("6a"))): Int = { - @ann(immutable.this.List.apply[String]("7a")) @ann(immutable.this.List.apply[String]("7b")) val r: Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a")) = ((x.+(3): Int @ann(immutable.this.List.apply[String]("8a"))): Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a"))); - val s: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a")) = (4: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a"))); - r.+(s) - } - }; - () -} +{ + @new ann(immutable.this.List.apply("1a")) @new ann(immutable.this.List.apply("1b")) class C[@new ann(immutable.this.List.apply("2a")) @new ann(immutable.this.List.apply("2b")) T >: Nothing <: Any] extends AnyRef { + @new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) private[this] val x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b")) = _; + def (@new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b"))) = { + super.(); + () + }; + @new ann(immutable.this.List.apply("5a")) @new ann(immutable.this.List.apply("5b")) def f(x: Int @ann(immutable.this.List.apply("6a")) @ann(immutable.this.List.apply("6b"))) = { + @new ann(immutable.this.List.apply("7a")) @new ann(immutable.this.List.apply("7b")) val r = x.$plus(3): @ann(immutable.this.List.apply("8a")): @ann(immutable.this.List.apply("8b")); + val s = (4: Int @ann(immutable.this.List.apply("9a")) @ann(immutable.this.List.apply("9b"))); + r.$plus(s) + } + }; + () +} +{ + @ann(immutable.this.List.apply[String]("1a")) @ann(immutable.this.List.apply[String]("1b")) class C[@ann(immutable.this.List.apply[String]("2a")) @ann(immutable.this.List.apply[String]("2b")) T] extends AnyRef { + @ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) private[this] val x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a")) = _; + def (@ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a"))): C[T] = { + C.super.(); + () + }; + @ann(immutable.this.List.apply[String]("5a")) @ann(immutable.this.List.apply[String]("5b")) def f(x: Int @ann(immutable.this.List.apply[String]("6b")) @ann(immutable.this.List.apply[String]("6a"))): Int = { + @ann(immutable.this.List.apply[String]("7a")) @ann(immutable.this.List.apply[String]("7b")) val r: Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a")) = ((x.+(3): Int @ann(immutable.this.List.apply[String]("8a"))): Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a"))); + val s: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a")) = (4: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a"))); + r.+(s) + } + }; + () +} diff --git a/test/files/run/reify_ann1b.check b/test/files/run/reify_ann1b.check index 4a51c02701..6a5f32a492 100644 --- a/test/files/run/reify_ann1b.check +++ b/test/files/run/reify_ann1b.check @@ -1,30 +1,30 @@ -{ - @new ann(bar = "1a") @new ann(bar = "1b") class C[@new ann(bar = "2a") @new ann(bar = "2b") T >: Nothing <: Any] extends AnyRef { - @new ann(bar = "3a") @new ann(bar = "3b") private[this] val x: T @ann(bar = "4a") @ann(bar = "4b") = _; - def (@new ann(bar = "3a") @new ann(bar = "3b") x: T @ann(bar = "4a") @ann(bar = "4b")) = { - super.(); - () - }; - @new ann(bar = "5a") @new ann(bar = "5b") def f(x: Int @ann(bar = "6a") @ann(bar = "6b")) = { - @new ann(bar = "7a") @new ann(bar = "7b") val r = x.$plus(3): @ann(bar = "8a"): @ann(bar = "8b"); - val s = (4: Int @ann(bar = "9a") @ann(bar = "9b")); - r.$plus(s) - } - }; - () -} -{ - @ann(bar = "1a") @ann(bar = "1b") class C[@ann(bar = "2a") @ann(bar = "2b") T] extends AnyRef { - @ann(bar = "3a") @ann(bar = "3b") private[this] val x: T @ann(bar = "4b") @ann(bar = "4a") = _; - def (@ann(bar = "3a") @ann(bar = "3b") x: T @ann(bar = "4b") @ann(bar = "4a")): C[T] = { - C.super.(); - () - }; - @ann(bar = "5a") @ann(bar = "5b") def f(x: Int @ann(bar = "6b") @ann(bar = "6a")): Int = { - @ann(bar = "7a") @ann(bar = "7b") val r: Int @ann(bar = "8b") @ann(bar = "8a") = ((x.+(3): Int @ann(bar = "8a")): Int @ann(bar = "8b") @ann(bar = "8a")); - val s: Int @ann(bar = "9b") @ann(bar = "9a") = (4: Int @ann(bar = "9b") @ann(bar = "9a")); - r.+(s) - } - }; - () -} +{ + @new ann(bar = "1a") @new ann(bar = "1b") class C[@new ann(bar = "2a") @new ann(bar = "2b") T >: Nothing <: Any] extends AnyRef { + @new ann(bar = "3a") @new ann(bar = "3b") private[this] val x: T @ann(bar = "4a") @ann(bar = "4b") = _; + def (@new ann(bar = "3a") @new ann(bar = "3b") x: T @ann(bar = "4a") @ann(bar = "4b")) = { + super.(); + () + }; + @new ann(bar = "5a") @new ann(bar = "5b") def f(x: Int @ann(bar = "6a") @ann(bar = "6b")) = { + @new ann(bar = "7a") @new ann(bar = "7b") val r = x.$plus(3): @ann(bar = "8a"): @ann(bar = "8b"); + val s = (4: Int @ann(bar = "9a") @ann(bar = "9b")); + r.$plus(s) + } + }; + () +} +{ + @ann(bar = "1a") @ann(bar = "1b") class C[@ann(bar = "2a") @ann(bar = "2b") T] extends AnyRef { + @ann(bar = "3a") @ann(bar = "3b") private[this] val x: T @ann(bar = "4b") @ann(bar = "4a") = _; + def (@ann(bar = "3a") @ann(bar = "3b") x: T @ann(bar = "4b") @ann(bar = "4a")): C[T] = { + C.super.(); + () + }; + @ann(bar = "5a") @ann(bar = "5b") def f(x: Int @ann(bar = "6b") @ann(bar = "6a")): Int = { + @ann(bar = "7a") @ann(bar = "7b") val r: Int @ann(bar = "8b") @ann(bar = "8a") = ((x.+(3): Int @ann(bar = "8a")): Int @ann(bar = "8b") @ann(bar = "8a")); + val s: Int @ann(bar = "9b") @ann(bar = "9a") = (4: Int @ann(bar = "9b") @ann(bar = "9a")); + r.+(s) + } + }; + () +} diff --git a/test/files/run/reify_ann2a.check b/test/files/run/reify_ann2a.check index 4d67bbf786..934af54802 100644 --- a/test/files/run/reify_ann2a.check +++ b/test/files/run/reify_ann2a.check @@ -1,44 +1,44 @@ -{ - class ann extends StaticAnnotation { - private[this] val bar: List[String] = _; - def (bar: List[String]) = { - super.(); - () - } - }; - @new ann(immutable.this.List.apply("1a")) @new ann(immutable.this.List.apply("1b")) class C[@new ann(immutable.this.List.apply("2a")) @new ann(immutable.this.List.apply("2b")) T >: Nothing <: Any] extends AnyRef { - @new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) private[this] val x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b")) = _; - def (@new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b"))) = { - super.(); - () - }; - @new ann(immutable.this.List.apply("5a")) @new ann(immutable.this.List.apply("5b")) def f(x: Int @ann(immutable.this.List.apply("6a")) @ann(immutable.this.List.apply("6b"))) = { - @new ann(immutable.this.List.apply("7a")) @new ann(immutable.this.List.apply("7b")) val r = x.$plus(3): @ann(immutable.this.List.apply("8a")): @ann(immutable.this.List.apply("8b")); - val s = (4: Int @ann(immutable.this.List.apply("9a")) @ann(immutable.this.List.apply("9b"))); - r.$plus(s) - } - }; - () -} -{ - class ann extends scala.annotation.Annotation with scala.annotation.StaticAnnotation { - private[this] val bar: List[String] = _; - def (bar: List[String]): ann = { - ann.super.(); - () - } - }; - @ann(immutable.this.List.apply[String]("1a")) @ann(immutable.this.List.apply[String]("1b")) class C[@ann(immutable.this.List.apply[String]("2a")) @ann(immutable.this.List.apply[String]("2b")) T] extends AnyRef { - @ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) private[this] val x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a")) = _; - def (@ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a"))): C[T] = { - C.super.(); - () - }; - @ann(immutable.this.List.apply[String]("5a")) @ann(immutable.this.List.apply[String]("5b")) def f(x: Int @ann(immutable.this.List.apply[String]("6b")) @ann(immutable.this.List.apply[String]("6a"))): Int = { - @ann(immutable.this.List.apply[String]("7a")) @ann(immutable.this.List.apply[String]("7b")) val r: Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a")) = ((x.+(3): Int @ann(immutable.this.List.apply[String]("8a"))): Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a"))); - val s: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a")) = (4: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a"))); - r.+(s) - } - }; - () -} +{ + class ann extends StaticAnnotation { + private[this] val bar: List[String] = _; + def (bar: List[String]) = { + super.(); + () + } + }; + @new ann(immutable.this.List.apply("1a")) @new ann(immutable.this.List.apply("1b")) class C[@new ann(immutable.this.List.apply("2a")) @new ann(immutable.this.List.apply("2b")) T >: Nothing <: Any] extends AnyRef { + @new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) private[this] val x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b")) = _; + def (@new ann(immutable.this.List.apply("3a")) @new ann(immutable.this.List.apply("3b")) x: T @ann(immutable.this.List.apply("4a")) @ann(immutable.this.List.apply("4b"))) = { + super.(); + () + }; + @new ann(immutable.this.List.apply("5a")) @new ann(immutable.this.List.apply("5b")) def f(x: Int @ann(immutable.this.List.apply("6a")) @ann(immutable.this.List.apply("6b"))) = { + @new ann(immutable.this.List.apply("7a")) @new ann(immutable.this.List.apply("7b")) val r = x.$plus(3): @ann(immutable.this.List.apply("8a")): @ann(immutable.this.List.apply("8b")); + val s = (4: Int @ann(immutable.this.List.apply("9a")) @ann(immutable.this.List.apply("9b"))); + r.$plus(s) + } + }; + () +} +{ + class ann extends scala.annotation.Annotation with scala.annotation.StaticAnnotation { + private[this] val bar: List[String] = _; + def (bar: List[String]): ann = { + ann.super.(); + () + } + }; + @ann(immutable.this.List.apply[String]("1a")) @ann(immutable.this.List.apply[String]("1b")) class C[@ann(immutable.this.List.apply[String]("2a")) @ann(immutable.this.List.apply[String]("2b")) T] extends AnyRef { + @ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) private[this] val x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a")) = _; + def (@ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a"))): C[T] = { + C.super.(); + () + }; + @ann(immutable.this.List.apply[String]("5a")) @ann(immutable.this.List.apply[String]("5b")) def f(x: Int @ann(immutable.this.List.apply[String]("6b")) @ann(immutable.this.List.apply[String]("6a"))): Int = { + @ann(immutable.this.List.apply[String]("7a")) @ann(immutable.this.List.apply[String]("7b")) val r: Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a")) = ((x.+(3): Int @ann(immutable.this.List.apply[String]("8a"))): Int @ann(immutable.this.List.apply[String]("8b")) @ann(immutable.this.List.apply[String]("8a"))); + val s: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a")) = (4: Int @ann(immutable.this.List.apply[String]("9b")) @ann(immutable.this.List.apply[String]("9a"))); + r.+(s) + } + }; + () +} diff --git a/test/files/run/reify_ann3.check b/test/files/run/reify_ann3.check index 96b4cf9c4e..8caceb2696 100644 --- a/test/files/run/reify_ann3.check +++ b/test/files/run/reify_ann3.check @@ -1,21 +1,21 @@ -{ - class Tree[A >: Nothing <: Any, B >: Nothing <: Any] extends AnyRef { - @new inline @getter() final val key: A = _; - def (key: A) = { - super.(); - () - } - }; - () -} -{ - class Tree[A, B] extends AnyRef { - final private[this] val key: A = _; - @inline @scala.annotation.meta.getter final def key: A = Tree.this.key; - def (key: A): Tree[A,B] = { - Tree.super.(); - () - } - }; - () -} +{ + class Tree[A >: Nothing <: Any, B >: Nothing <: Any] extends AnyRef { + @new inline @getter() final val key: A = _; + def (key: A) = { + super.(); + () + } + }; + () +} +{ + class Tree[A, B] extends AnyRef { + final private[this] val key: A = _; + @inline @scala.annotation.meta.getter final def key: A = Tree.this.key; + def (key: A): Tree[A,B] = { + Tree.super.(); + () + } + }; + () +} diff --git a/test/files/run/reify_ann4.check b/test/files/run/reify_ann4.check index 6f853053d2..8bf5fe3242 100644 --- a/test/files/run/reify_ann4.check +++ b/test/files/run/reify_ann4.check @@ -1,32 +1,32 @@ -{ - class D extends StaticAnnotation { - def () = { - super.(); - () - } - }; - class C extends AnyRef { - def () = { - super.(); - () - } - }; - val c1 = new C @D(); - () -} -{ - class D extends scala.annotation.Annotation with scala.annotation.StaticAnnotation { - def (): D = { - D.super.(); - () - } - }; - class C extends AnyRef { - def (): C = { - C.super.(); - () - } - }; - val c1: C = new C @D(); - () -} +{ + class D extends StaticAnnotation { + def () = { + super.(); + () + } + }; + class C extends AnyRef { + def () = { + super.(); + () + } + }; + val c1 = new C @D(); + () +} +{ + class D extends scala.annotation.Annotation with scala.annotation.StaticAnnotation { + def (): D = { + D.super.(); + () + } + }; + class C extends AnyRef { + def (): C = { + C.super.(); + () + } + }; + val c1: C = new C @D(); + () +} diff --git a/test/files/run/reify_ann5.check b/test/files/run/reify_ann5.check index d443c601a0..1ec0457e54 100644 --- a/test/files/run/reify_ann5.check +++ b/test/files/run/reify_ann5.check @@ -1,22 +1,22 @@ -{ - class C extends AnyRef { - @new inline @beanGetter() @new BeanProperty() val x: Int = _; - def (x: Int) = { - super.(); - () - } - }; - () -} -{ - class C extends AnyRef { - @scala.beans.BeanProperty private[this] val x: Int = _; - def x: Int = C.this.x; - def (x: Int): C = { - C.super.(); - () - }; - @inline @scala.annotation.meta.beanGetter def getX(): Int = C.this.x - }; - () -} +{ + class C extends AnyRef { + @new inline @beanGetter() @new BeanProperty() val x: Int = _; + def (x: Int) = { + super.(); + () + } + }; + () +} +{ + class C extends AnyRef { + @scala.beans.BeanProperty private[this] val x: Int = _; + def x: Int = C.this.x; + def (x: Int): C = { + C.super.(); + () + }; + @inline @scala.annotation.meta.beanGetter def getX(): Int = C.this.x + }; + () +} diff --git a/test/files/run/reify_classfileann_a.check b/test/files/run/reify_classfileann_a.check index 6f17b26158..0c919020a8 100644 --- a/test/files/run/reify_classfileann_a.check +++ b/test/files/run/reify_classfileann_a.check @@ -1,18 +1,18 @@ -{ - @new ann(bar = "1", quux = Array("2", "3"), baz = new ann(bar = "4")) class C extends AnyRef { - def () = { - super.(); - () - } - }; - () -} -{ - @ann(bar = "1", quux = ["2", "3"], baz = ann(bar = "4")) class C extends AnyRef { - def (): C = { - C.super.(); - () - } - }; - () -} +{ + @new ann(bar = "1", quux = Array("2", "3"), baz = new ann(bar = "4")) class C extends AnyRef { + def () = { + super.(); + () + } + }; + () +} +{ + @ann(bar = "1", quux = ["2", "3"], baz = ann(bar = "4")) class C extends AnyRef { + def (): C = { + C.super.(); + () + } + }; + () +} diff --git a/test/files/run/reify_classfileann_b.check b/test/files/run/reify_classfileann_b.check index 33270e0035..c204fa8dc0 100644 --- a/test/files/run/reify_classfileann_b.check +++ b/test/files/run/reify_classfileann_b.check @@ -1,20 +1,20 @@ -{ - class C extends AnyRef { - def () = { - super.(); - () - }; - def x: Int = 2: @ann(bar = "1",quux = Array("2", "3"),baz = new ann(bar = "4")) - }; - () -} -{ - class C extends AnyRef { - def (): C = { - C.super.(); - () - }; - def x: Int = (2: Int(2) @ann(bar = "1", quux = ["2", "3"], baz = ann(bar = "4"))) - }; - () -} +{ + class C extends AnyRef { + def () = { + super.(); + () + }; + def x: Int = 2: @ann(bar = "1",quux = Array("2", "3"),baz = new ann(bar = "4")) + }; + () +} +{ + class C extends AnyRef { + def (): C = { + C.super.(); + () + }; + def x: Int = (2: Int(2) @ann(bar = "1", quux = ["2", "3"], baz = ann(bar = "4"))) + }; + () +} diff --git a/test/files/run/reify_closure8b.check b/test/files/run/reify_closure8b.check index 585e6d5740..5a7863ff15 100644 --- a/test/files/run/reify_closure8b.check +++ b/test/files/run/reify_closure8b.check @@ -1,3 +1,3 @@ -scala.tools.reflect.ToolBoxError: reflective compilation has failed: - -value y is not a member of Test.Foo +scala.tools.reflect.ToolBoxError: reflective compilation has failed: + +value y is not a member of Test.Foo diff --git a/test/files/run/reify_copypaste1.check b/test/files/run/reify_copypaste1.check index 49a25ea881..b204f9c454 100644 --- a/test/files/run/reify_copypaste1.check +++ b/test/files/run/reify_copypaste1.check @@ -1,2 +1,2 @@ -List(1, 2) - +List(1, 2) + diff --git a/test/files/run/reify_nested_inner_refers_to_global.check b/test/files/run/reify_nested_inner_refers_to_global.check index 7ff4c83d37..5ef4ff4d04 100644 --- a/test/files/run/reify_nested_inner_refers_to_global.check +++ b/test/files/run/reify_nested_inner_refers_to_global.check @@ -1 +1 @@ -evaluated = 2 +evaluated = 2 diff --git a/test/files/run/reify_nested_outer_refers_to_global.check b/test/files/run/reify_nested_outer_refers_to_global.check index 7ff4c83d37..5ef4ff4d04 100644 --- a/test/files/run/reify_nested_outer_refers_to_global.check +++ b/test/files/run/reify_nested_outer_refers_to_global.check @@ -1 +1 @@ -evaluated = 2 +evaluated = 2 diff --git a/test/files/run/reify_nested_outer_refers_to_local.check b/test/files/run/reify_nested_outer_refers_to_local.check index 7ff4c83d37..5ef4ff4d04 100644 --- a/test/files/run/reify_nested_outer_refers_to_local.check +++ b/test/files/run/reify_nested_outer_refers_to_local.check @@ -1 +1 @@ -evaluated = 2 +evaluated = 2 diff --git a/test/files/run/reify_newimpl_11.check b/test/files/run/reify_newimpl_11.check index 21bd28667e..2f5cb581e6 100644 --- a/test/files/run/reify_newimpl_11.check +++ b/test/files/run/reify_newimpl_11.check @@ -1,2 +1,2 @@ -scala.tools.reflect.ToolBoxError: reflective toolbox has failed: -unresolved free type variables (namely: T defined by C in reify_newimpl_11.scala:6:11). have you forgot to use TypeTag annotations for type parameters external to a reifee? if you have troubles tracking free type variables, consider using -Xlog-free-types +scala.tools.reflect.ToolBoxError: reflective toolbox has failed: +unresolved free type variables (namely: T defined by C in reify_newimpl_11.scala:6:11). have you forgot to use TypeTag annotations for type parameters external to a reifee? if you have troubles tracking free type variables, consider using -Xlog-free-types diff --git a/test/files/run/reify_newimpl_13.check b/test/files/run/reify_newimpl_13.check index e28732bd6a..d518cd7b84 100644 --- a/test/files/run/reify_newimpl_13.check +++ b/test/files/run/reify_newimpl_13.check @@ -1,2 +1,2 @@ -scala.tools.reflect.ToolBoxError: reflective toolbox has failed: -unresolved free type variables (namely: T defined by C in reify_newimpl_13.scala:7:13). have you forgot to use TypeTag annotations for type parameters external to a reifee? if you have troubles tracking free type variables, consider using -Xlog-free-types +scala.tools.reflect.ToolBoxError: reflective toolbox has failed: +unresolved free type variables (namely: T defined by C in reify_newimpl_13.scala:7:13). have you forgot to use TypeTag annotations for type parameters external to a reifee? if you have troubles tracking free type variables, consider using -Xlog-free-types diff --git a/test/files/run/reify_newimpl_18.check b/test/files/run/reify_newimpl_18.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_18.check +++ b/test/files/run/reify_newimpl_18.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_19.check b/test/files/run/reify_newimpl_19.check index 1d96992869..8b8652f92c 100644 --- a/test/files/run/reify_newimpl_19.check +++ b/test/files/run/reify_newimpl_19.check @@ -1,2 +1,2 @@ -scala.tools.reflect.ToolBoxError: reflective toolbox has failed: -unresolved free type variables (namely: T defined by C in reify_newimpl_19.scala:7:10). have you forgot to use TypeTag annotations for type parameters external to a reifee? if you have troubles tracking free type variables, consider using -Xlog-free-types +scala.tools.reflect.ToolBoxError: reflective toolbox has failed: +unresolved free type variables (namely: T defined by C in reify_newimpl_19.scala:7:10). have you forgot to use TypeTag annotations for type parameters external to a reifee? if you have troubles tracking free type variables, consider using -Xlog-free-types diff --git a/test/files/run/reify_newimpl_20.check b/test/files/run/reify_newimpl_20.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_20.check +++ b/test/files/run/reify_newimpl_20.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_21.check b/test/files/run/reify_newimpl_21.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_21.check +++ b/test/files/run/reify_newimpl_21.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_22.check b/test/files/run/reify_newimpl_22.check index ebcf42f52f..dcb3e2889b 100644 --- a/test/files/run/reify_newimpl_22.check +++ b/test/files/run/reify_newimpl_22.check @@ -1,29 +1,29 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import scala.reflect.runtime.universe._ -import scala.reflect.runtime.universe._ - -scala> import scala.tools.reflect.ToolBox -import scala.tools.reflect.ToolBox - -scala> import scala.tools.reflect.Eval -import scala.tools.reflect.Eval - -scala> { - val x = 2 - val code = reify { - x - } - println(code.eval) -} -:15: free term: Ident(newTermName("x")) defined by res0 in :14:21 - val code = reify { - ^ -2 - -scala> - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> import scala.reflect.runtime.universe._ +import scala.reflect.runtime.universe._ + +scala> import scala.tools.reflect.ToolBox +import scala.tools.reflect.ToolBox + +scala> import scala.tools.reflect.Eval +import scala.tools.reflect.Eval + +scala> { + val x = 2 + val code = reify { + x + } + println(code.eval) +} +:15: free term: Ident(newTermName("x")) defined by res0 in :14:21 + val code = reify { + ^ +2 + +scala> + +scala> diff --git a/test/files/run/reify_newimpl_23.check b/test/files/run/reify_newimpl_23.check index c8ed424c86..882124657e 100644 --- a/test/files/run/reify_newimpl_23.check +++ b/test/files/run/reify_newimpl_23.check @@ -1,28 +1,28 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import scala.reflect.runtime.universe._ -import scala.reflect.runtime.universe._ - -scala> import scala.tools.reflect.ToolBox -import scala.tools.reflect.ToolBox - -scala> import scala.tools.reflect.Eval -import scala.tools.reflect.Eval - -scala> def foo[T]{ - val code = reify { - List[T]() - } - println(code.eval) -} -:13: free type: Ident(newTypeName("T")) defined by foo in :12:16 - val code = reify { - ^ -foo: [T]=> Unit - -scala> - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> import scala.reflect.runtime.universe._ +import scala.reflect.runtime.universe._ + +scala> import scala.tools.reflect.ToolBox +import scala.tools.reflect.ToolBox + +scala> import scala.tools.reflect.Eval +import scala.tools.reflect.Eval + +scala> def foo[T]{ + val code = reify { + List[T]() + } + println(code.eval) +} +:13: free type: Ident(newTypeName("T")) defined by foo in :12:16 + val code = reify { + ^ +foo: [T]=> Unit + +scala> + +scala> diff --git a/test/files/run/reify_newimpl_25.check b/test/files/run/reify_newimpl_25.check index a688a98fbc..d1028b94c7 100644 --- a/test/files/run/reify_newimpl_25.check +++ b/test/files/run/reify_newimpl_25.check @@ -1,19 +1,19 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> { - import scala.reflect.runtime.universe._ - val x = "2" - val tt = implicitly[TypeTag[x.type]] - println(tt) -} -:11: free term: Ident(newTermName("x")) defined by res0 in :10:21 - val tt = implicitly[TypeTag[x.type]] - ^ -TypeTag[x.type] - -scala> - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> { + import scala.reflect.runtime.universe._ + val x = "2" + val tt = implicitly[TypeTag[x.type]] + println(tt) +} +:11: free term: Ident(newTermName("x")) defined by res0 in :10:21 + val tt = implicitly[TypeTag[x.type]] + ^ +TypeTag[x.type] + +scala> + +scala> diff --git a/test/files/run/reify_newimpl_26.check b/test/files/run/reify_newimpl_26.check index 5996f3b322..347f6365aa 100644 --- a/test/files/run/reify_newimpl_26.check +++ b/test/files/run/reify_newimpl_26.check @@ -1,21 +1,21 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> def foo[T]{ - import scala.reflect.runtime.universe._ - val tt = implicitly[WeakTypeTag[List[T]]] - println(tt) -} -:9: free type: Ident(newTypeName("T")) defined by foo in :7:16 - val tt = implicitly[WeakTypeTag[List[T]]] - ^ -foo: [T]=> Unit - -scala> foo[Int] -WeakTypeTag[scala.List[T]] - -scala> - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> def foo[T]{ + import scala.reflect.runtime.universe._ + val tt = implicitly[WeakTypeTag[List[T]]] + println(tt) +} +:9: free type: Ident(newTypeName("T")) defined by foo in :7:16 + val tt = implicitly[WeakTypeTag[List[T]]] + ^ +foo: [T]=> Unit + +scala> foo[Int] +WeakTypeTag[scala.List[T]] + +scala> + +scala> diff --git a/test/files/run/reify_newimpl_27.check b/test/files/run/reify_newimpl_27.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_27.check +++ b/test/files/run/reify_newimpl_27.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_29.check b/test/files/run/reify_newimpl_29.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_29.check +++ b/test/files/run/reify_newimpl_29.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_30.check b/test/files/run/reify_newimpl_30.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_30.check +++ b/test/files/run/reify_newimpl_30.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_31.check b/test/files/run/reify_newimpl_31.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_31.check +++ b/test/files/run/reify_newimpl_31.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_33.check b/test/files/run/reify_newimpl_33.check index a7029974a4..c23af69b08 100644 --- a/test/files/run/reify_newimpl_33.check +++ b/test/files/run/reify_newimpl_33.check @@ -1 +1 @@ -List(2) +List(2) diff --git a/test/files/run/reify_newimpl_35.check b/test/files/run/reify_newimpl_35.check index f8306003b5..5545e6e005 100644 --- a/test/files/run/reify_newimpl_35.check +++ b/test/files/run/reify_newimpl_35.check @@ -1,17 +1,17 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import scala.reflect.runtime.universe._ -import scala.reflect.runtime.universe._ - -scala> def foo[T: TypeTag] = reify{List[T]()} -foo: [T](implicit evidence$1: reflect.runtime.universe.TypeTag[T])reflect.runtime.universe.Expr[List[T]] - -scala> println(foo) -Expr[List[Nothing]](immutable.this.Nil) - -scala> - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> import scala.reflect.runtime.universe._ +import scala.reflect.runtime.universe._ + +scala> def foo[T: TypeTag] = reify{List[T]()} +foo: [T](implicit evidence$1: reflect.runtime.universe.TypeTag[T])reflect.runtime.universe.Expr[List[T]] + +scala> println(foo) +Expr[List[Nothing]](immutable.this.Nil) + +scala> + +scala> diff --git a/test/files/run/reify_newimpl_36.check b/test/files/run/reify_newimpl_36.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/reify_newimpl_36.check +++ b/test/files/run/reify_newimpl_36.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/reify_newimpl_37.check b/test/files/run/reify_newimpl_37.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/reify_newimpl_37.check +++ b/test/files/run/reify_newimpl_37.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/reify_newimpl_38.check b/test/files/run/reify_newimpl_38.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/reify_newimpl_38.check +++ b/test/files/run/reify_newimpl_38.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/reify_newimpl_39.check b/test/files/run/reify_newimpl_39.check index 2f562a182f..d81cc0710e 100644 --- a/test/files/run/reify_newimpl_39.check +++ b/test/files/run/reify_newimpl_39.check @@ -1 +1 @@ -42 +42 diff --git a/test/files/run/reify_newimpl_40.check b/test/files/run/reify_newimpl_40.check index 94c5a65fe0..cc0001ab3b 100644 --- a/test/files/run/reify_newimpl_40.check +++ b/test/files/run/reify_newimpl_40.check @@ -1 +1 @@ -74088 +74088 diff --git a/test/files/run/repl-power.check b/test/files/run/repl-power.check index c509434116..9d63ecde94 100644 --- a/test/files/run/repl-power.check +++ b/test/files/run/repl-power.check @@ -1,32 +1,32 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power. ** - -scala> // guarding against "error: reference to global is ambiguous" - -scala> global.emptyValDef // "it is imported twice in the same scope by ..." -res0: $r.global.emptyValDef.type = private val _ = _ - -scala> val tp = ArrayClass[scala.util.Random] // magic with tags -tp: $r.global.Type = Array[scala.util.Random] - -scala> tp.memberType(Array_apply) // evidence -res1: $r.global.Type = (i: Int)scala.util.Random - -scala> val m = LIT(10) MATCH (CASE(LIT(5)) ==> FALSE, DEFAULT ==> TRUE) // treedsl -m: $r.treedsl.global.Match = -10 match { - case 5 => false - case _ => true -} - -scala> typed(m).tpe // typed is in scope -res2: $r.treedsl.global.Type = Boolean - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> :power +** Power User mode enabled - BEEP WHIR GYVE ** +** :phase has been set to 'typer'. ** +** scala.tools.nsc._ has been imported ** +** global._, definitions._ also imported ** +** Try :help, :vals, power. ** + +scala> // guarding against "error: reference to global is ambiguous" + +scala> global.emptyValDef // "it is imported twice in the same scope by ..." +res0: $r.global.emptyValDef.type = private val _ = _ + +scala> val tp = ArrayClass[scala.util.Random] // magic with tags +tp: $r.global.Type = Array[scala.util.Random] + +scala> tp.memberType(Array_apply) // evidence +res1: $r.global.Type = (i: Int)scala.util.Random + +scala> val m = LIT(10) MATCH (CASE(LIT(5)) ==> FALSE, DEFAULT ==> TRUE) // treedsl +m: $r.treedsl.global.Match = +10 match { + case 5 => false + case _ => true +} + +scala> typed(m).tpe // typed is in scope +res2: $r.treedsl.global.Type = Boolean + +scala> diff --git a/test/files/run/runtimeEval2.check b/test/files/run/runtimeEval2.check index 78c6baefdd..0cfbf08886 100644 --- a/test/files/run/runtimeEval2.check +++ b/test/files/run/runtimeEval2.check @@ -1 +1 @@ -2 +2 diff --git a/test/files/run/showraw_mods.check b/test/files/run/showraw_mods.check index 6fc3ffe051..7fca027614 100644 --- a/test/files/run/showraw_mods.check +++ b/test/files/run/showraw_mods.check @@ -1 +1 @@ -Block(List(ClassDef(Modifiers(ABSTRACT | DEFAULTPARAM/TRAIT), newTypeName("C"), List(), Template(List(Ident(newTypeName("AnyRef"))), emptyValDef, List(DefDef(Modifiers(), newTermName("$init$"), List(), List(List()), TypeTree(), Block(List(), Literal(Constant(())))), ValDef(Modifiers(PRIVATE | LOCAL), newTermName("x"), TypeTree(), Literal(Constant(2))), ValDef(Modifiers(MUTABLE), newTermName("y"), TypeTree(), Select(This(newTypeName("C")), newTermName("x"))), ValDef(Modifiers(LAZY), newTermName("z"), TypeTree(), Select(This(newTypeName("C")), newTermName("y"))))))), Literal(Constant(()))) +Block(List(ClassDef(Modifiers(ABSTRACT | DEFAULTPARAM/TRAIT), newTypeName("C"), List(), Template(List(Ident(newTypeName("AnyRef"))), emptyValDef, List(DefDef(Modifiers(), newTermName("$init$"), List(), List(List()), TypeTree(), Block(List(), Literal(Constant(())))), ValDef(Modifiers(PRIVATE | LOCAL), newTermName("x"), TypeTree(), Literal(Constant(2))), ValDef(Modifiers(MUTABLE), newTermName("y"), TypeTree(), Select(This(newTypeName("C")), newTermName("x"))), ValDef(Modifiers(LAZY), newTermName("z"), TypeTree(), Select(This(newTypeName("C")), newTermName("y"))))))), Literal(Constant(()))) diff --git a/test/files/run/showraw_tree.check b/test/files/run/showraw_tree.check index d3a1fddf48..dca272684e 100644 --- a/test/files/run/showraw_tree.check +++ b/test/files/run/showraw_tree.check @@ -1,2 +1,2 @@ -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) diff --git a/test/files/run/showraw_tree_ids.check b/test/files/run/showraw_tree_ids.check index 0c189130cf..d25599c7fc 100644 --- a/test/files/run/showraw_tree_ids.check +++ b/test/files/run/showraw_tree_ids.check @@ -1,2 +1,2 @@ -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap#), List(Ident(newTypeName("String")#), Ident(newTypeName("String")#)))), nme.CONSTRUCTOR), List()) -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap#), List(Ident(newTypeName("String")#), Ident(newTypeName("String")#)))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap#), List(Ident(newTypeName("String")#), Ident(newTypeName("String")#)))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap#), List(Ident(newTypeName("String")#), Ident(newTypeName("String")#)))), nme.CONSTRUCTOR), List()) diff --git a/test/files/run/showraw_tree_kinds.check b/test/files/run/showraw_tree_kinds.check index 7b4ab456b0..d0d4cd0058 100644 --- a/test/files/run/showraw_tree_kinds.check +++ b/test/files/run/showraw_tree_kinds.check @@ -1,2 +1,2 @@ -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap#CLS), List(Ident(newTypeName("String")#TPE), Ident(newTypeName("String")#TPE)))), nme.CONSTRUCTOR), List()) -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap#CLS), List(Ident(newTypeName("String")#TPE), Ident(newTypeName("String")#TPE)))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap#CLS), List(Ident(newTypeName("String")#TPE), Ident(newTypeName("String")#TPE)))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap#CLS), List(Ident(newTypeName("String")#TPE), Ident(newTypeName("String")#TPE)))), nme.CONSTRUCTOR), List()) diff --git a/test/files/run/showraw_tree_types_ids.check b/test/files/run/showraw_tree_types_ids.check index 39e68dc881..92ee45a1e6 100644 --- a/test/files/run/showraw_tree_types_ids.check +++ b/test/files/run/showraw_tree_types_ids.check @@ -1,10 +1,10 @@ -Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap#), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)))))), nme.CONSTRUCTOR#), List()) -[1] TypeRef(ThisType(scala.collection.immutable#), scala.collection.immutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()))) -[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable#), scala.collection.immutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List())))) -[3] TypeRef(ThisType(scala.collection.immutable#), scala.collection.immutable.HashMap#, List()) -[4] TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()) -Apply[5](Select[6](New[5](TypeTree[5]().setOriginal(AppliedTypeTree(Ident[7](scala.collection.mutable.HashMap#), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)))))), nme.CONSTRUCTOR#), List()) -[4] TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()) -[5] TypeRef(ThisType(scala.collection.mutable#), scala.collection.mutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()))) -[6] MethodType(List(), TypeRef(ThisType(scala.collection.mutable#), scala.collection.mutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List())))) -[7] TypeRef(ThisType(scala.collection.mutable#), scala.collection.mutable.HashMap#, List()) +Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap#), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)))))), nme.CONSTRUCTOR#), List()) +[1] TypeRef(ThisType(scala.collection.immutable#), scala.collection.immutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()))) +[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable#), scala.collection.immutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List())))) +[3] TypeRef(ThisType(scala.collection.immutable#), scala.collection.immutable.HashMap#, List()) +[4] TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()) +Apply[5](Select[6](New[5](TypeTree[5]().setOriginal(AppliedTypeTree(Ident[7](scala.collection.mutable.HashMap#), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")#)))))), nme.CONSTRUCTOR#), List()) +[4] TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()) +[5] TypeRef(ThisType(scala.collection.mutable#), scala.collection.mutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()))) +[6] MethodType(List(), TypeRef(ThisType(scala.collection.mutable#), scala.collection.mutable.HashMap#, List(TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List()), TypeRef(ThisType(scala.Predef#), newTypeName("String")#, List())))) +[7] TypeRef(ThisType(scala.collection.mutable#), scala.collection.mutable.HashMap#, List()) diff --git a/test/files/run/showraw_tree_types_typed.check b/test/files/run/showraw_tree_types_typed.check index 0a41f5185c..c6c20409dc 100644 --- a/test/files/run/showraw_tree_types_typed.check +++ b/test/files/run/showraw_tree_types_typed.check @@ -1,10 +1,10 @@ -Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))), TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))))))), nme.CONSTRUCTOR), List()) -[1] TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List()))) -[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List())))) -[3] TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List()) -[4] TypeRef(ThisType(scala.Predef), newTypeName("String"), List()) -Apply[5](Select[6](New[5](TypeTree[5]().setOriginal(AppliedTypeTree(Ident[7](scala.collection.mutable.HashMap), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))), TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))))))), nme.CONSTRUCTOR), List()) -[4] TypeRef(ThisType(scala.Predef), newTypeName("String"), List()) -[5] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List()))) -[6] MethodType(List(), TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List())))) -[7] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List()) +Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))), TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))))))), nme.CONSTRUCTOR), List()) +[1] TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List()))) +[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List())))) +[3] TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List()) +[4] TypeRef(ThisType(scala.Predef), newTypeName("String"), List()) +Apply[5](Select[6](New[5](TypeTree[5]().setOriginal(AppliedTypeTree(Ident[7](scala.collection.mutable.HashMap), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))), TypeTree[4]().setOriginal(Ident[4](newTypeName("String"))))))), nme.CONSTRUCTOR), List()) +[4] TypeRef(ThisType(scala.Predef), newTypeName("String"), List()) +[5] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List()))) +[6] MethodType(List(), TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(ThisType(scala.Predef), newTypeName("String"), List()), TypeRef(ThisType(scala.Predef), newTypeName("String"), List())))) +[7] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List()) diff --git a/test/files/run/showraw_tree_types_untyped.check b/test/files/run/showraw_tree_types_untyped.check index d3a1fddf48..dca272684e 100644 --- a/test/files/run/showraw_tree_types_untyped.check +++ b/test/files/run/showraw_tree_types_untyped.check @@ -1,2 +1,2 @@ -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) -Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.immutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) +Apply(Select(New(AppliedTypeTree(Ident(scala.collection.mutable.HashMap), List(Ident(newTypeName("String")), Ident(newTypeName("String"))))), nme.CONSTRUCTOR), List()) diff --git a/test/files/run/showraw_tree_ultimate.check b/test/files/run/showraw_tree_ultimate.check index 400b736704..46ccd4df8f 100644 --- a/test/files/run/showraw_tree_ultimate.check +++ b/test/files/run/showraw_tree_ultimate.check @@ -1,10 +1,10 @@ -Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap##CLS), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)))))), nme.CONSTRUCTOR##PCTOR), List()) -[1] TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()))) -[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List())))) -[3] TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List()) -[4] TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()) -Apply[5](Select[6](New[5](TypeTree[5]().setOriginal(AppliedTypeTree(Ident[7](scala.collection.mutable.HashMap##CLS), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)))))), nme.CONSTRUCTOR##CTOR), List()) -[4] TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()) -[5] TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()))) -[6] MethodType(List(), TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List())))) -[7] TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List()) +Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap##CLS), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)))))), nme.CONSTRUCTOR##PCTOR), List()) +[1] TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()))) +[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List())))) +[3] TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List()) +[4] TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()) +Apply[5](Select[6](New[5](TypeTree[5]().setOriginal(AppliedTypeTree(Ident[7](scala.collection.mutable.HashMap##CLS), List(TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)), TypeTree[4]().setOriginal(Ident[4](newTypeName("String")##TPE)))))), nme.CONSTRUCTOR##CTOR), List()) +[4] TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()) +[5] TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()))) +[6] MethodType(List(), TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List(TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List()), TypeRef(ThisType(scala.Predef##MODC), newTypeName("String")##TPE, List())))) +[7] TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List()) diff --git a/test/files/run/t1195-new.check b/test/files/run/t1195-new.check index 4dd1661d1b..e0c9ac07ff 100644 --- a/test/files/run/t1195-new.check +++ b/test/files/run/t1195-new.check @@ -1,6 +1,6 @@ -Bar.type, underlying = <: scala.runtime.AbstractFunction1[Int,Bar] with Serializable{case def unapply(x$0: Bar): Option[Int]} with Singleton -Bar, underlying = <: Product with Serializable{val x: Int; def copy(x: Int): Bar; def copy$default$1: Int; def _1: Int} -Product with Serializable, underlying = Product with Serializable -Bar.type, underlying = <: scala.runtime.AbstractFunction1[Int,Bar] with Serializable{case def unapply(x$0: Bar): Option[Int]} with Singleton -Bar, underlying = <: Product with Serializable{val x: Int; def copy(x: Int): Bar; def copy$default$1: Int; def _1: Int} -Product with Serializable, underlying = Product with Serializable +Bar.type, underlying = <: scala.runtime.AbstractFunction1[Int,Bar] with Serializable{case def unapply(x$0: Bar): Option[Int]} with Singleton +Bar, underlying = <: Product with Serializable{val x: Int; def copy(x: Int): Bar; def copy$default$1: Int; def _1: Int} +Product with Serializable, underlying = Product with Serializable +Bar.type, underlying = <: scala.runtime.AbstractFunction1[Int,Bar] with Serializable{case def unapply(x$0: Bar): Option[Int]} with Singleton +Bar, underlying = <: Product with Serializable{val x: Int; def copy(x: Int): Bar; def copy$default$1: Int; def _1: Int} +Product with Serializable, underlying = Product with Serializable diff --git a/test/files/run/t1195-old.check b/test/files/run/t1195-old.check index eb60eceb17..d023bc91f7 100644 --- a/test/files/run/t1195-old.check +++ b/test/files/run/t1195-old.check @@ -1,6 +1,6 @@ -_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object -_ <: Object with scala.Product with scala.Serializable -Object with scala.Product with scala.Serializable -_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object -_ <: Object with scala.Product with scala.Serializable -Object with scala.Product with scala.Serializable +_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with scala.Product with scala.Serializable +Object with scala.Product with scala.Serializable +_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with scala.Product with scala.Serializable +Object with scala.Product with scala.Serializable diff --git a/test/files/run/t2386-new.check b/test/files/run/t2386-new.check index 98e226f946..8ed0ffd7d8 100644 --- a/test/files/run/t2386-new.check +++ b/test/files/run/t2386-new.check @@ -1,2 +1,2 @@ -a(0) = Array(1, 2) -a(1) = Array("a", "b") +a(0) = Array(1, 2) +a(1) = Array("a", "b") diff --git a/test/files/run/t2886.check b/test/files/run/t2886.check index 8d97a82799..ce31bc7408 100644 --- a/test/files/run/t2886.check +++ b/test/files/run/t2886.check @@ -1,5 +1,5 @@ -((x: String) => { - val x$1 = x; - val x$2 = x; - Test.this.test(x$2, x$1) -}) +((x: String) => { + val x$1 = x; + val x$2 = x; + Test.this.test(x$2, x$1) +}) diff --git a/test/files/run/t3507-new.check b/test/files/run/t3507-new.check index b02c40fc26..208e093004 100644 --- a/test/files/run/t3507-new.check +++ b/test/files/run/t3507-new.check @@ -1 +1 @@ -_1.b.c.type +_1.b.c.type diff --git a/test/files/run/t4110-new.check b/test/files/run/t4110-new.check index 5cbfb27f3e..c0f646c5f6 100644 --- a/test/files/run/t4110-new.check +++ b/test/files/run/t4110-new.check @@ -1,2 +1,2 @@ -Test.A with Test.B -Test.A with Test.B +Test.A with Test.B +Test.A with Test.B diff --git a/test/files/run/t4216.check b/test/files/run/t4216.check index 6f2684f42d..091e55a0c7 100644 --- a/test/files/run/t4216.check +++ b/test/files/run/t4216.check @@ -1,37 +1,37 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> import scala.reflect.ClassTag -import scala.reflect.ClassTag - -scala> def f[A: ClassTag](a: A) = java.util.Arrays.asList(Array(a): _*) -f: [A](a: A)(implicit evidence$1: scala.reflect.ClassTag[A])java.util.List[A] - -scala> f(".") -res0: java.util.List[String] = [.] - -scala> f(0) -res1: java.util.List[Int] = [0] - -scala> def i(a: Int) = java.util.Arrays.asList(Array(a): _*) -i: (a: Int)java.util.List[Int] - -scala> i(0) -res2: java.util.List[Int] = [0] - -scala> def o(a: Any) = java.util.Arrays.asList(Array(a): _*) -o: (a: Any)java.util.List[Any] - -scala> o(".") -res3: java.util.List[Any] = [.] - -scala> class V(val a: Int) extends AnyVal -defined class V - -scala> f(new V(0)) -res4: java.util.List[V] = [V@0] - -scala> o(new V(0)) -res5: java.util.List[Any] = [V@0] - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> import scala.reflect.ClassTag +import scala.reflect.ClassTag + +scala> def f[A: ClassTag](a: A) = java.util.Arrays.asList(Array(a): _*) +f: [A](a: A)(implicit evidence$1: scala.reflect.ClassTag[A])java.util.List[A] + +scala> f(".") +res0: java.util.List[String] = [.] + +scala> f(0) +res1: java.util.List[Int] = [0] + +scala> def i(a: Int) = java.util.Arrays.asList(Array(a): _*) +i: (a: Int)java.util.List[Int] + +scala> i(0) +res2: java.util.List[Int] = [0] + +scala> def o(a: Any) = java.util.Arrays.asList(Array(a): _*) +o: (a: Any)java.util.List[Any] + +scala> o(".") +res3: java.util.List[Any] = [.] + +scala> class V(val a: Int) extends AnyVal +defined class V + +scala> f(new V(0)) +res4: java.util.List[V] = [V@0] + +scala> o(new V(0)) +res5: java.util.List[Any] = [V@0] + +scala> diff --git a/test/files/run/t4835.check b/test/files/run/t4835.check index 531c3d7bb6..0987722d5f 100644 --- a/test/files/run/t4835.check +++ b/test/files/run/t4835.check @@ -1,7 +1,7 @@ --1 0 1 2 3 4 5 6 7 8 9 --1 1 3 5 7 9 11 13 15 17 19 -1 1 -2 1 2 -2 1 A 2 -3 1 2 3 -3 1 A 2 B 3 +-1 0 1 2 3 4 5 6 7 8 9 +-1 1 3 5 7 9 11 13 15 17 19 +1 1 +2 1 2 +2 1 A 2 +3 1 2 3 +3 1 A 2 B 3 diff --git a/test/files/run/t4835.scala b/test/files/run/t4835.scala index 50d161be40..c964e42e7c 100644 --- a/test/files/run/t4835.scala +++ b/test/files/run/t4835.scala @@ -1,38 +1,38 @@ -/* - * Test case for SI-4835. This tests confirm that the fix - * doesn't break laziness. To test memory consumption, - * I need to confirm that OutOfMemoryError doesn't occur. - * I could create such tests. However, such tests consume - * too much time and memory. - */ -object Test { - private final val INFINITE = -1 - def testStreamIterator(num: Int, stream: Stream[Int]): Unit = { - val iter = stream.iterator - print(num) - // if num == -1, then steram is infinite sequence - if (num == INFINITE) { - for(i <- 0 until 10) { - print(" " + iter.next()) - } - } else { - while(iter.hasNext) { - print(" " + iter.next()) - } - } - println() - } - - def main(args: Array[String]): Unit = { - import Stream.{from, cons, empty} - testStreamIterator(INFINITE, from(0)) - testStreamIterator(INFINITE, from(0).filter(_ % 2 == 1)) - testStreamIterator(1, Stream(1)) - testStreamIterator(2, Stream(1, 2)) - //Stream with side effect - testStreamIterator(2, cons(1, cons({ print(" A"); 2}, empty))) - testStreamIterator(3, Stream(1, 2, 3)) - //Stream with side effect - testStreamIterator(3, cons(1, cons({ print(" A"); 2}, cons({ print(" B"); 3}, Stream.empty)))) - } -} +/* + * Test case for SI-4835. This tests confirm that the fix + * doesn't break laziness. To test memory consumption, + * I need to confirm that OutOfMemoryError doesn't occur. + * I could create such tests. However, such tests consume + * too much time and memory. + */ +object Test { + private final val INFINITE = -1 + def testStreamIterator(num: Int, stream: Stream[Int]): Unit = { + val iter = stream.iterator + print(num) + // if num == -1, then steram is infinite sequence + if (num == INFINITE) { + for(i <- 0 until 10) { + print(" " + iter.next()) + } + } else { + while(iter.hasNext) { + print(" " + iter.next()) + } + } + println() + } + + def main(args: Array[String]): Unit = { + import Stream.{from, cons, empty} + testStreamIterator(INFINITE, from(0)) + testStreamIterator(INFINITE, from(0).filter(_ % 2 == 1)) + testStreamIterator(1, Stream(1)) + testStreamIterator(2, Stream(1, 2)) + //Stream with side effect + testStreamIterator(2, cons(1, cons({ print(" A"); 2}, empty))) + testStreamIterator(3, Stream(1, 2, 3)) + //Stream with side effect + testStreamIterator(3, cons(1, cons({ print(" A"); 2}, cons({ print(" B"); 3}, Stream.empty)))) + } +} diff --git a/test/files/run/t4935.check b/test/files/run/t4935.check index ef0493b275..ce01362503 100644 --- a/test/files/run/t4935.check +++ b/test/files/run/t4935.check @@ -1 +1 @@ -hello +hello diff --git a/test/files/run/t4935.scala b/test/files/run/t4935.scala index 18631e2041..5940355b9b 100644 --- a/test/files/run/t4935.scala +++ b/test/files/run/t4935.scala @@ -1,9 +1,9 @@ -object Test extends App { - for (i <- 0 to 1) { - val a = Foo - } -} - -object Foo { - println("hello") -} +object Test extends App { + for (i <- 0 to 1) { + val a = Foo + } +} + +object Foo { + println("hello") +} diff --git a/test/files/run/t5224.check b/test/files/run/t5224.check index ffeb7b43ce..e15c1c90eb 100644 --- a/test/files/run/t5224.check +++ b/test/files/run/t5224.check @@ -1,9 +1,9 @@ -{ - @new Foo(bar = "qwe") class C extends AnyRef { - def () = { - super.(); - () - } - }; - () -} +{ + @new Foo(bar = "qwe") class C extends AnyRef { + def () = { + super.(); + () + } + }; + () +} diff --git a/test/files/run/t5225_1.check b/test/files/run/t5225_1.check index 40db2468b1..1a47aacfd0 100644 --- a/test/files/run/t5225_1.check +++ b/test/files/run/t5225_1.check @@ -1,4 +1,4 @@ -{ - @new transient() @new volatile() var x = 2; - () -} +{ + @new transient() @new volatile() var x = 2; + () +} diff --git a/test/files/run/t5225_2.check b/test/files/run/t5225_2.check index 8cd2ddc1a4..8ed54a14bb 100644 --- a/test/files/run/t5225_2.check +++ b/test/files/run/t5225_2.check @@ -1,4 +1,4 @@ -{ - def foo(@new cloneable() x: Int) = ""; - () -} +{ + def foo(@new cloneable() x: Int) = ""; + () +} diff --git a/test/files/run/t5256c.check b/test/files/run/t5256c.check index 16bfc6c9d0..7fcd0eb722 100644 --- a/test/files/run/t5256c.check +++ b/test/files/run/t5256c.check @@ -1,6 +1,6 @@ -class A$1 -Test.A$1 +class A$1 +Test.A$1 java.lang.Object { def foo(): Nothing def (): A$1 -} +} diff --git a/test/files/run/t5256g.check b/test/files/run/t5256g.check index 5aac899694..c9c8d6e63d 100644 --- a/test/files/run/t5256g.check +++ b/test/files/run/t5256g.check @@ -1,3 +1,3 @@ -anonymous class $anon$1 -Test.$anon$1 -A with B{def (): A with B} +anonymous class $anon$1 +Test.$anon$1 +A with B{def (): A with B} diff --git a/test/files/run/t5256h.check b/test/files/run/t5256h.check index 2a6b292486..1b23a71a4c 100644 --- a/test/files/run/t5256h.check +++ b/test/files/run/t5256h.check @@ -1,7 +1,7 @@ -anonymous class $anon$1 -Test.$anon$1 +anonymous class $anon$1 +Test.$anon$1 java.lang.Object { final private val x: Int def x(): Int def (): java.lang.Object{def x(): Int} -} +} diff --git a/test/files/run/t5271_1.check b/test/files/run/t5271_1.check index 5245173228..544b4d2762 100644 --- a/test/files/run/t5271_1.check +++ b/test/files/run/t5271_1.check @@ -1,12 +1,12 @@ -{ - case class C extends Product with Serializable { - val foo: Int = _; - val bar: Int = _; - def (foo: Int, bar: Int) = { - super.(); - () - } - }; - () -} -() +{ + case class C extends Product with Serializable { + val foo: Int = _; + val bar: Int = _; + def (foo: Int, bar: Int) = { + super.(); + () + } + }; + () +} +() diff --git a/test/files/run/t5271_2.check b/test/files/run/t5271_2.check index 0765b3a6a4..585331be65 100644 --- a/test/files/run/t5271_2.check +++ b/test/files/run/t5271_2.check @@ -1,14 +1,14 @@ -{ - case class C extends Product with Serializable { - val foo: Int = _; - val bar: Int = _; - def (foo: Int, bar: Int) = { - super.(); - () - } - }; - val c = C.apply(2, 2); - scala.this.Predef.println(c.foo.$times(c.bar)) -} -4 -() +{ + case class C extends Product with Serializable { + val foo: Int = _; + val bar: Int = _; + def (foo: Int, bar: Int) = { + super.(); + () + } + }; + val c = C.apply(2, 2); + scala.this.Predef.println(c.foo.$times(c.bar)) +} +4 +() diff --git a/test/files/run/t5271_3.check b/test/files/run/t5271_3.check index 3cfedbacd7..b02acd21f9 100644 --- a/test/files/run/t5271_3.check +++ b/test/files/run/t5271_3.check @@ -1,21 +1,21 @@ -{ - object C extends AnyRef { - def () = { - super.(); - () - }; - def qwe = 4 - }; - case class C extends Product with Serializable { - val foo: Int = _; - val bar: Int = _; - def (foo: Int, bar: Int) = { - super.(); - () - } - }; - val c = C.apply(2, 2); - scala.this.Predef.println(c.foo.$times(c.bar).$eq$eq(C.qwe)) -} -true -() +{ + object C extends AnyRef { + def () = { + super.(); + () + }; + def qwe = 4 + }; + case class C extends Product with Serializable { + val foo: Int = _; + val bar: Int = _; + def (foo: Int, bar: Int) = { + super.(); + () + } + }; + val c = C.apply(2, 2); + scala.this.Predef.println(c.foo.$times(c.bar).$eq$eq(C.qwe)) +} +true +() diff --git a/test/files/run/t5418a.check b/test/files/run/t5418a.check index ee0e80e11f..527022936d 100644 --- a/test/files/run/t5418a.check +++ b/test/files/run/t5418a.check @@ -1 +1 @@ -Expr[Class[_ <: java.lang.Object]](new Object().getClass()) +Expr[Class[_ <: java.lang.Object]](new Object().getClass()) diff --git a/test/files/run/t5418b.check b/test/files/run/t5418b.check index 875ad08435..48d82a2aae 100644 --- a/test/files/run/t5418b.check +++ b/test/files/run/t5418b.check @@ -1,2 +1,2 @@ -new Object().getClass() -TypeRef(ThisType(java.lang), java.lang.Class, List(TypeRef(NoPrefix, newTypeName("?0"), List()))) +new Object().getClass() +TypeRef(ThisType(java.lang), java.lang.Class, List(TypeRef(NoPrefix, newTypeName("?0"), List()))) diff --git a/test/files/run/t5419.check b/test/files/run/t5419.check index 50751b168e..a9c0f262e3 100644 --- a/test/files/run/t5419.check +++ b/test/files/run/t5419.check @@ -1 +1 @@ -5: @Foo.asInstanceOf[Int] +5: @Foo.asInstanceOf[Int] diff --git a/test/files/run/t5680.check b/test/files/run/t5680.check index 9fec3b6505..0d825ab7d0 100644 --- a/test/files/run/t5680.check +++ b/test/files/run/t5680.check @@ -1,3 +1,3 @@ -[Lscala.runtime.BoxedUnit -() -() +[Lscala.runtime.BoxedUnit +() +() diff --git a/test/files/run/t5704.check b/test/files/run/t5704.check index 0f6c84d2ec..102e3209c6 100644 --- a/test/files/run/t5704.check +++ b/test/files/run/t5704.check @@ -1 +1 @@ -String +String diff --git a/test/files/run/t5713.check b/test/files/run/t5713.check index d3e9348123..1419eb9d79 100644 --- a/test/files/run/t5713.check +++ b/test/files/run/t5713.check @@ -1 +1 @@ -err +err diff --git a/test/files/run/t5770.check b/test/files/run/t5770.check index eeb1d55321..f00c965d83 100644 --- a/test/files/run/t5770.check +++ b/test/files/run/t5770.check @@ -1,10 +1,10 @@ -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 diff --git a/test/files/run/t5816.check b/test/files/run/t5816.check index 920b64a50d..8e58ace9b4 100644 --- a/test/files/run/t5816.check +++ b/test/files/run/t5816.check @@ -1 +1 @@ -5.+(Test.this.y) +5.+(Test.this.y) diff --git a/test/files/run/t5881.check b/test/files/run/t5881.check index 8e596e9323..f4aeec680a 100644 --- a/test/files/run/t5881.check +++ b/test/files/run/t5881.check @@ -1,2 +1,2 @@ -scala.collection.immutable.List -scala.collection.immutable.List +scala.collection.immutable.List +scala.collection.immutable.List diff --git a/test/files/run/t5943a1.check b/test/files/run/t5943a1.check index 9b3d7a049f..9f4d160af8 100644 --- a/test/files/run/t5943a1.check +++ b/test/files/run/t5943a1.check @@ -1 +1 @@ -scala.this.Predef.intWrapper(1).to(3).map[Int, scala.collection.immutable.IndexedSeq[Int]](((x$1: Int) => x$1.+(1)))(immutable.this.IndexedSeq.canBuildFrom[Int]) +scala.this.Predef.intWrapper(1).to(3).map[Int, scala.collection.immutable.IndexedSeq[Int]](((x$1: Int) => x$1.+(1)))(immutable.this.IndexedSeq.canBuildFrom[Int]) diff --git a/test/files/run/t5943a2.check b/test/files/run/t5943a2.check index 90e88e2997..29ad79c3ce 100644 --- a/test/files/run/t5943a2.check +++ b/test/files/run/t5943a2.check @@ -1 +1 @@ -Vector(2, 3, 4) +Vector(2, 3, 4) diff --git a/test/files/run/t6086-repl.check b/test/files/run/t6086-repl.check index f868aa18d0..97f20bd66b 100644 --- a/test/files/run/t6086-repl.check +++ b/test/files/run/t6086-repl.check @@ -1,12 +1,12 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> case class X(s: String) -defined class X - -scala> scala.reflect.runtime.universe.typeOf[X] -res0: reflect.runtime.universe.Type = X - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> case class X(s: String) +defined class X + +scala> scala.reflect.runtime.universe.typeOf[X] +res0: reflect.runtime.universe.Type = X + +scala> diff --git a/test/files/run/t6086-vanilla.check b/test/files/run/t6086-vanilla.check index fd66be08d0..62d8fe9f6d 100644 --- a/test/files/run/t6086-vanilla.check +++ b/test/files/run/t6086-vanilla.check @@ -1 +1 @@ -X +X diff --git a/test/files/run/t6188.check b/test/files/run/t6188.check index 1af3932ecd..5d64afc47b 100644 --- a/test/files/run/t6188.check +++ b/test/files/run/t6188.check @@ -1 +1 @@ -Failure(java.lang.Exception: this is an exception) +Failure(java.lang.Exception: this is an exception) diff --git a/test/files/run/t6199-mirror.check b/test/files/run/t6199-mirror.check index ec969b5b93..6a452c185a 100644 --- a/test/files/run/t6199-mirror.check +++ b/test/files/run/t6199-mirror.check @@ -1 +1 @@ -() +() diff --git a/test/files/run/t6199-toolbox.check b/test/files/run/t6199-toolbox.check index ec969b5b93..6a452c185a 100644 --- a/test/files/run/t6199-toolbox.check +++ b/test/files/run/t6199-toolbox.check @@ -1 +1 @@ -() +() diff --git a/test/files/run/t6287.check b/test/files/run/t6287.check index 2a783704a2..a86ecbee42 100644 --- a/test/files/run/t6287.check +++ b/test/files/run/t6287.check @@ -1,3 +1,3 @@ -Vector(2, 3, 4) -Vector(2, 3, 4) -Vector(2, 3, 4) +Vector(2, 3, 4) +Vector(2, 3, 4) +Vector(2, 3, 4) diff --git a/test/files/run/t6318_derived.check b/test/files/run/t6318_derived.check index ad43b6579b..926f2a4ba2 100644 --- a/test/files/run/t6318_derived.check +++ b/test/files/run/t6318_derived.check @@ -1,3 +1,3 @@ -Some(X) -true -Some(X) +Some(X) +true +Some(X) diff --git a/test/files/run/t6318_primitives.check b/test/files/run/t6318_primitives.check index bb474c3bdc..b330f91276 100644 --- a/test/files/run/t6318_primitives.check +++ b/test/files/run/t6318_primitives.check @@ -1,36 +1,36 @@ -true -Some(1) -false -None -true -Some(1) -false -None -true -Some() -false -None -true -Some(1) -false -None -true -Some(1) -false -None -true -Some(1.0) -false -None -true -Some(1.0) -false -None -true -Some(true) -false -None -true -Some(()) -false -None +true +Some(1) +false +None +true +Some(1) +false +None +true +Some() +false +None +true +Some(1) +false +None +true +Some(1) +false +None +true +Some(1.0) +false +None +true +Some(1.0) +false +None +true +Some(true) +false +None +true +Some(()) +false +None diff --git a/test/files/run/t6323b.check b/test/files/run/t6323b.check index 80b6176178..d6b1d1fd90 100644 --- a/test/files/run/t6323b.check +++ b/test/files/run/t6323b.check @@ -1 +1 @@ -cannot reflect value a, because it's a member of a weak type Test +cannot reflect value a, because it's a member of a weak type Test diff --git a/test/files/run/t6329_repl.check b/test/files/run/t6329_repl.check index d4804fae37..8663184bde 100644 --- a/test/files/run/t6329_repl.check +++ b/test/files/run/t6329_repl.check @@ -1,13 +1,13 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> classManifest[List[_]] -warning: there were 1 deprecation warnings; re-run with -deprecation for details -res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[Any] - -scala> scala.reflect.classTag[List[_]] -res1: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> classManifest[List[_]] +warning: there were 1 deprecation warnings; re-run with -deprecation for details +res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[Any] + +scala> scala.reflect.classTag[List[_]] +res1: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List + +scala> diff --git a/test/files/run/t6329_repl_bug.check b/test/files/run/t6329_repl_bug.check index d4804fae37..8663184bde 100644 --- a/test/files/run/t6329_repl_bug.check +++ b/test/files/run/t6329_repl_bug.check @@ -1,13 +1,13 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> classManifest[List[_]] -warning: there were 1 deprecation warnings; re-run with -deprecation for details -res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[Any] - -scala> scala.reflect.classTag[List[_]] -res1: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List - -scala> +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> classManifest[List[_]] +warning: there were 1 deprecation warnings; re-run with -deprecation for details +res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[Any] + +scala> scala.reflect.classTag[List[_]] +res1: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List + +scala> diff --git a/test/files/run/t6329_vanilla.check b/test/files/run/t6329_vanilla.check index 7e7c3d11df..8282afaeba 100644 --- a/test/files/run/t6329_vanilla.check +++ b/test/files/run/t6329_vanilla.check @@ -1,2 +1,2 @@ -scala.collection.immutable.List[Any] -scala.collection.immutable.List +scala.collection.immutable.List[Any] +scala.collection.immutable.List diff --git a/test/files/run/t6329_vanilla_bug.check b/test/files/run/t6329_vanilla_bug.check index 7e7c3d11df..8282afaeba 100644 --- a/test/files/run/t6329_vanilla_bug.check +++ b/test/files/run/t6329_vanilla_bug.check @@ -1,2 +1,2 @@ -scala.collection.immutable.List[Any] -scala.collection.immutable.List +scala.collection.immutable.List[Any] +scala.collection.immutable.List diff --git a/test/files/run/t6392a.check b/test/files/run/t6392a.check index ec969b5b93..6a452c185a 100644 --- a/test/files/run/t6392a.check +++ b/test/files/run/t6392a.check @@ -1 +1 @@ -() +() diff --git a/test/files/run/t6392b.check b/test/files/run/t6392b.check index ee19836b95..e9c7ecaa34 100644 --- a/test/files/run/t6392b.check +++ b/test/files/run/t6392b.check @@ -1 +1 @@ -ModuleDef(Modifiers(), newTermName("C"), Template(List(Select(Ident(scala#PK), newTypeName("AnyRef")#TPE)), emptyValDef, List(DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(newTypeName("C")), tpnme.EMPTY), nme.CONSTRUCTOR#PCTOR), List())), Literal(Constant(()))))))) +ModuleDef(Modifiers(), newTermName("C"), Template(List(Select(Ident(scala#PK), newTypeName("AnyRef")#TPE)), emptyValDef, List(DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(newTypeName("C")), tpnme.EMPTY), nme.CONSTRUCTOR#PCTOR), List())), Literal(Constant(()))))))) diff --git a/test/files/run/t6394b.check b/test/files/run/t6394b.check index 34997f71e3..2a02d41ce2 100644 --- a/test/files/run/t6394b.check +++ b/test/files/run/t6394b.check @@ -1 +1 @@ -TEST +TEST diff --git a/test/files/run/test-cpp.check b/test/files/run/test-cpp.check index a7163edb5f..bfea438c60 100644 --- a/test/files/run/test-cpp.check +++ b/test/files/run/test-cpp.check @@ -1,65 +1,65 @@ -37c37 -< locals: value args, value x, value y ---- -> locals: value args -42,43d41 -< 52 CONSTANT(2) -< 52 STORE_LOCAL(value x) -45,46d42 -< 53 LOAD_LOCAL(value x) -< 53 STORE_LOCAL(value y) -49c45 -< 54 LOAD_LOCAL(value y) ---- -> 54 CONSTANT(2) -92c88 -< locals: value args, value x, value y ---- -> locals: value args, value x -101,102d96 -< 82 LOAD_LOCAL(value x) -< 82 STORE_LOCAL(value y) -105c99 -< 83 LOAD_LOCAL(value y) ---- -> 83 LOAD_LOCAL(value x) -135c129 -< locals: value args, value x, value y ---- -> locals: value args -140,141d133 -< 66 THIS(TestAliasChainDerefThis) -< 66 STORE_LOCAL(value x) -143,144d134 -< 67 LOAD_LOCAL(value x) -< 67 STORE_LOCAL(value y) -147c137 -< 68 LOAD_LOCAL(value y) ---- -> 68 THIS(Object) -176c166 -< locals: value x, value y ---- -> locals: value x -181,182d170 -< 29 LOAD_LOCAL(value x) -< 29 STORE_LOCAL(value y) -185c173 -< 30 LOAD_LOCAL(value y) ---- -> 30 LOAD_LOCAL(value x) -223,224d210 -< 97 LOAD_LOCAL(variable x) -< 97 STORE_LOCAL(variable y) -227c213 -< 98 LOAD_LOCAL(variable y) ---- -> 98 LOAD_LOCAL(variable x) -233,234d218 -< 101 LOAD_LOCAL(variable y) -< 101 STORE_LOCAL(variable x) -236c220 -< 102 LOAD_LOCAL(variable x) ---- -> 102 LOAD_LOCAL(variable y) - +37c37 +< locals: value args, value x, value y +--- +> locals: value args +42,43d41 +< 52 CONSTANT(2) +< 52 STORE_LOCAL(value x) +45,46d42 +< 53 LOAD_LOCAL(value x) +< 53 STORE_LOCAL(value y) +49c45 +< 54 LOAD_LOCAL(value y) +--- +> 54 CONSTANT(2) +92c88 +< locals: value args, value x, value y +--- +> locals: value args, value x +101,102d96 +< 82 LOAD_LOCAL(value x) +< 82 STORE_LOCAL(value y) +105c99 +< 83 LOAD_LOCAL(value y) +--- +> 83 LOAD_LOCAL(value x) +135c129 +< locals: value args, value x, value y +--- +> locals: value args +140,141d133 +< 66 THIS(TestAliasChainDerefThis) +< 66 STORE_LOCAL(value x) +143,144d134 +< 67 LOAD_LOCAL(value x) +< 67 STORE_LOCAL(value y) +147c137 +< 68 LOAD_LOCAL(value y) +--- +> 68 THIS(Object) +176c166 +< locals: value x, value y +--- +> locals: value x +181,182d170 +< 29 LOAD_LOCAL(value x) +< 29 STORE_LOCAL(value y) +185c173 +< 30 LOAD_LOCAL(value y) +--- +> 30 LOAD_LOCAL(value x) +223,224d210 +< 97 LOAD_LOCAL(variable x) +< 97 STORE_LOCAL(variable y) +227c213 +< 98 LOAD_LOCAL(variable y) +--- +> 98 LOAD_LOCAL(variable x) +233,234d218 +< 101 LOAD_LOCAL(variable y) +< 101 STORE_LOCAL(variable x) +236c220 +< 102 LOAD_LOCAL(variable x) +--- +> 102 LOAD_LOCAL(variable y) + diff --git a/test/files/run/toolbox_default_reporter_is_silent.check b/test/files/run/toolbox_default_reporter_is_silent.check index ef0493b275..ce01362503 100644 --- a/test/files/run/toolbox_default_reporter_is_silent.check +++ b/test/files/run/toolbox_default_reporter_is_silent.check @@ -1 +1 @@ -hello +hello diff --git a/test/files/run/toolbox_typecheck_implicitsdisabled.check b/test/files/run/toolbox_typecheck_implicitsdisabled.check index e2f2dbe4b9..db64e118ca 100644 --- a/test/files/run/toolbox_typecheck_implicitsdisabled.check +++ b/test/files/run/toolbox_typecheck_implicitsdisabled.check @@ -1,5 +1,5 @@ -{ - import scala.Predef._; - scala.Predef.any2ArrowAssoc[Int](1).->[Int](2) -} -scala.tools.reflect.ToolBoxError: reflective typecheck has failed: value -> is not a member of Int +{ + import scala.Predef._; + scala.Predef.any2ArrowAssoc[Int](1).->[Int](2) +} +scala.tools.reflect.ToolBoxError: reflective typecheck has failed: value -> is not a member of Int diff --git a/test/files/run/toolbox_typecheck_inferimplicitvalue.check b/test/files/run/toolbox_typecheck_inferimplicitvalue.check index 23ba536aff..ec17b4203b 100644 --- a/test/files/run/toolbox_typecheck_inferimplicitvalue.check +++ b/test/files/run/toolbox_typecheck_inferimplicitvalue.check @@ -1 +1 @@ -C.MC +C.MC diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.check b/test/files/run/toolbox_typecheck_macrosdisabled.check index 49e25bd0e7..9e997dafed 100644 --- a/test/files/run/toolbox_typecheck_macrosdisabled.check +++ b/test/files/run/toolbox_typecheck_macrosdisabled.check @@ -1,41 +1,41 @@ -{ - val $u: ru.type = ru; - val $m: $u.Mirror = ru.runtimeMirror({ - final class $anon extends scala.AnyRef { - def (): anonymous class $anon = { - $anon.super.(); - () - }; - () - }; - new $anon() -}.getClass().getClassLoader()); - $u.Expr.apply[Int(2)]($m, { - final class $treecreator1 extends TreeCreator { - def (): $treecreator1 = { - $treecreator1.super.(); - () - }; - def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.Literal.apply($u.Constant.apply(2)) - } - }; - new $treecreator1() - })($u.TypeTag.apply[Int(2)]($m, { - final class $typecreator2 extends TypeCreator { - def (): $typecreator2 = { - $typecreator2.super.(); - () - }; - def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.ConstantType.apply($u.Constant.apply(2)) - } - }; - new $typecreator2() - })) -} -ru.reify[Int](2) +{ + val $u: ru.type = ru; + val $m: $u.Mirror = ru.runtimeMirror({ + final class $anon extends scala.AnyRef { + def (): anonymous class $anon = { + $anon.super.(); + () + }; + () + }; + new $anon() +}.getClass().getClassLoader()); + $u.Expr.apply[Int(2)]($m, { + final class $treecreator1 extends TreeCreator { + def (): $treecreator1 = { + $treecreator1.super.(); + () + }; + def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.Literal.apply($u.Constant.apply(2)) + } + }; + new $treecreator1() + })($u.TypeTag.apply[Int(2)]($m, { + final class $typecreator2 extends TypeCreator { + def (): $typecreator2 = { + $typecreator2.super.(); + () + }; + def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.ConstantType.apply($u.Constant.apply(2)) + } + }; + new $typecreator2() + })) +} +ru.reify[Int](2) diff --git a/test/files/run/toolbox_typecheck_macrosdisabled2.check b/test/files/run/toolbox_typecheck_macrosdisabled2.check index 8bbe65e21b..16c8d6c397 100644 --- a/test/files/run/toolbox_typecheck_macrosdisabled2.check +++ b/test/files/run/toolbox_typecheck_macrosdisabled2.check @@ -1,41 +1,41 @@ -{ - val $u: ru.type = ru; - val $m: $u.Mirror = ru.runtimeMirror({ - final class $anon extends scala.AnyRef { - def (): anonymous class $anon = { - $anon.super.(); - () - }; - () - }; - new $anon() -}.getClass().getClassLoader()); - $u.Expr.apply[Array[Int]]($m, { - final class $treecreator1 extends TreeCreator { - def (): $treecreator1 = { - $treecreator1.super.(); - () - }; - def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.Apply.apply($u.Select.apply($u.Select.apply($u.build.Ident($m.staticPackage("scala")), $u.newTermName("Array")), $u.newTermName("apply")), scala.collection.immutable.List.apply[$u.Literal]($u.Literal.apply($u.Constant.apply(2)))) - } - }; - new $treecreator1() - })($u.TypeTag.apply[Array[Int]]($m, { - final class $typecreator2 extends TypeCreator { - def (): $typecreator2 = { - $typecreator2.super.(); - () - }; - def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { - val $u: U = $m$untyped.universe; - val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; - $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModule.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asType.toTypeConstructor)) - } - }; - new $typecreator2() - })) -} -ru.reify[Array[Int]](scala.Array.apply(2)) +{ + val $u: ru.type = ru; + val $m: $u.Mirror = ru.runtimeMirror({ + final class $anon extends scala.AnyRef { + def (): anonymous class $anon = { + $anon.super.(); + () + }; + () + }; + new $anon() +}.getClass().getClassLoader()); + $u.Expr.apply[Array[Int]]($m, { + final class $treecreator1 extends TreeCreator { + def (): $treecreator1 = { + $treecreator1.super.(); + () + }; + def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Tree = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.Apply.apply($u.Select.apply($u.Select.apply($u.build.Ident($m.staticPackage("scala")), $u.newTermName("Array")), $u.newTermName("apply")), scala.collection.immutable.List.apply[$u.Literal]($u.Literal.apply($u.Constant.apply(2)))) + } + }; + new $treecreator1() + })($u.TypeTag.apply[Array[Int]]($m, { + final class $typecreator2 extends TypeCreator { + def (): $typecreator2 = { + $typecreator2.super.(); + () + }; + def apply[U <: scala.reflect.api.Universe with Singleton]($m$untyped: scala.reflect.api.MirrorOf[U]): U#Type = { + val $u: U = $m$untyped.universe; + val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror]; + $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModule.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asType.toTypeConstructor)) + } + }; + new $typecreator2() + })) +} +ru.reify[Array[Int]](scala.Array.apply(2)) diff --git a/test/files/run/typetags_core.check b/test/files/run/typetags_core.check index 8d20e099c4..980b4719bf 100644 --- a/test/files/run/typetags_core.check +++ b/test/files/run/typetags_core.check @@ -1,30 +1,30 @@ -true -TypeTag[Byte] -true -TypeTag[Short] -true -TypeTag[Char] -true -TypeTag[Int] -true -TypeTag[Long] -true -TypeTag[Float] -true -TypeTag[Double] -true -TypeTag[Boolean] -true -TypeTag[Unit] -true -TypeTag[Any] -true -TypeTag[AnyVal] -true -TypeTag[AnyRef] -true -TypeTag[java.lang.Object] -true -TypeTag[Null] -true -TypeTag[Nothing] +true +TypeTag[Byte] +true +TypeTag[Short] +true +TypeTag[Char] +true +TypeTag[Int] +true +TypeTag[Long] +true +TypeTag[Float] +true +TypeTag[Double] +true +TypeTag[Boolean] +true +TypeTag[Unit] +true +TypeTag[Any] +true +TypeTag[AnyVal] +true +TypeTag[AnyRef] +true +TypeTag[java.lang.Object] +true +TypeTag[Null] +true +TypeTag[Nothing] diff --git a/test/files/run/typetags_serialize.check b/test/files/run/typetags_serialize.check index 30952113f6..f79436ea5d 100644 --- a/test/files/run/typetags_serialize.check +++ b/test/files/run/typetags_serialize.check @@ -1,2 +1,2 @@ -java.io.NotSerializableException: scala.reflect.api.TypeTags$PredefTypeCreator -java.io.NotSerializableException: Test$$typecreator1$1 +java.io.NotSerializableException: scala.reflect.api.TypeTags$PredefTypeCreator +java.io.NotSerializableException: Test$$typecreator1$1 diff --git a/test/files/run/valueclasses-classmanifest-basic.check b/test/files/run/valueclasses-classmanifest-basic.check index 554c75e074..bc56c4d894 100644 --- a/test/files/run/valueclasses-classmanifest-basic.check +++ b/test/files/run/valueclasses-classmanifest-basic.check @@ -1 +1 @@ -Foo +Foo diff --git a/test/files/run/valueclasses-classmanifest-existential.check b/test/files/run/valueclasses-classmanifest-existential.check index e9fc6e27ea..4577aacc0e 100644 --- a/test/files/run/valueclasses-classmanifest-existential.check +++ b/test/files/run/valueclasses-classmanifest-existential.check @@ -1 +1 @@ -Foo[] +Foo[] diff --git a/test/files/run/valueclasses-classmanifest-generic.check b/test/files/run/valueclasses-classmanifest-generic.check index 1418c5cff9..c6be42d550 100644 --- a/test/files/run/valueclasses-classmanifest-generic.check +++ b/test/files/run/valueclasses-classmanifest-generic.check @@ -1 +1 @@ -Foo[java.lang.String] +Foo[java.lang.String] diff --git a/test/files/run/valueclasses-classtag-basic.check b/test/files/run/valueclasses-classtag-basic.check index 554c75e074..bc56c4d894 100644 --- a/test/files/run/valueclasses-classtag-basic.check +++ b/test/files/run/valueclasses-classtag-basic.check @@ -1 +1 @@ -Foo +Foo diff --git a/test/files/run/valueclasses-classtag-existential.check b/test/files/run/valueclasses-classtag-existential.check index 15ac02630f..9e2b9e1da7 100644 --- a/test/files/run/valueclasses-classtag-existential.check +++ b/test/files/run/valueclasses-classtag-existential.check @@ -1 +1 @@ -Object +Object diff --git a/test/files/run/valueclasses-classtag-generic.check b/test/files/run/valueclasses-classtag-generic.check index 554c75e074..bc56c4d894 100644 --- a/test/files/run/valueclasses-classtag-generic.check +++ b/test/files/run/valueclasses-classtag-generic.check @@ -1 +1 @@ -Foo +Foo diff --git a/test/files/run/valueclasses-manifest-basic.check b/test/files/run/valueclasses-manifest-basic.check index 554c75e074..bc56c4d894 100644 --- a/test/files/run/valueclasses-manifest-basic.check +++ b/test/files/run/valueclasses-manifest-basic.check @@ -1 +1 @@ -Foo +Foo diff --git a/test/files/run/valueclasses-manifest-existential.check b/test/files/run/valueclasses-manifest-existential.check index fdce051039..f91a575ea7 100644 --- a/test/files/run/valueclasses-manifest-existential.check +++ b/test/files/run/valueclasses-manifest-existential.check @@ -1 +1 @@ -Foo[_ <: Any] +Foo[_ <: Any] diff --git a/test/files/run/valueclasses-manifest-generic.check b/test/files/run/valueclasses-manifest-generic.check index 1418c5cff9..c6be42d550 100644 --- a/test/files/run/valueclasses-manifest-generic.check +++ b/test/files/run/valueclasses-manifest-generic.check @@ -1 +1 @@ -Foo[java.lang.String] +Foo[java.lang.String] diff --git a/test/files/run/valueclasses-typetag-basic.check b/test/files/run/valueclasses-typetag-basic.check index 554c75e074..bc56c4d894 100644 --- a/test/files/run/valueclasses-typetag-basic.check +++ b/test/files/run/valueclasses-typetag-basic.check @@ -1 +1 @@ -Foo +Foo diff --git a/test/files/run/valueclasses-typetag-existential.check b/test/files/run/valueclasses-typetag-existential.check index 0efa24a45f..d166a13fdc 100644 --- a/test/files/run/valueclasses-typetag-existential.check +++ b/test/files/run/valueclasses-typetag-existential.check @@ -1 +1 @@ -Foo[_] +Foo[_] diff --git a/test/files/run/valueclasses-typetag-generic.check b/test/files/run/valueclasses-typetag-generic.check index fce2e64f79..534d1b37c4 100644 --- a/test/files/run/valueclasses-typetag-generic.check +++ b/test/files/run/valueclasses-typetag-generic.check @@ -1 +1 @@ -Foo[String] +Foo[String] diff --git a/test/files/run/virtpatmat_typetag.check b/test/files/run/virtpatmat_typetag.check index eaa9f3361f..cac9d9a4d6 100644 --- a/test/files/run/virtpatmat_typetag.check +++ b/test/files/run/virtpatmat_typetag.check @@ -1,10 +1,10 @@ -1 is not a Int; it's a class java.lang.Integer -1 is a java.lang.Integer -1 is not a java.lang.String; it's a class java.lang.Integer -true is a Any -woele is a java.lang.String -1 is not a Int; it's a class java.lang.Integer -1 is a java.lang.Integer -1 is not a java.lang.String; it's a class java.lang.Integer -true is a Any -woele is a java.lang.String +1 is not a Int; it's a class java.lang.Integer +1 is a java.lang.Integer +1 is not a java.lang.String; it's a class java.lang.Integer +true is a Any +woele is a java.lang.String +1 is not a Int; it's a class java.lang.Integer +1 is a java.lang.Integer +1 is not a java.lang.String; it's a class java.lang.Integer +true is a Any +woele is a java.lang.String diff --git a/test/partest.bat b/test/partest.bat index 4c97a53122..b64347ce13 100755 --- a/test/partest.bat +++ b/test/partest.bat @@ -1,104 +1,104 @@ -@echo off - -rem ########################################################################## -rem # Scala code runner 2.9.1.final -rem ########################################################################## -rem # (c) 2002-2011 LAMP/EPFL -rem # -rem # This is free software; see the distribution for copying conditions. -rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -rem # PARTICULAR PURPOSE. -rem ########################################################################## - -rem We adopt the following conventions: -rem - System/user environment variables start with a letter -rem - Local batch variables start with an underscore ('_') - -if "%OS%"=="Windows_NT" ( - @setlocal - call :set_home - set _ARGS=%* -) else ( - set _SCALA_HOME="%SCALA_HOME%" - rem The following line tests SCALA_HOME instead of _SCALA_HOME, because - rem the above change to _SCALA_HOME is not visible within this block. - if "%SCALA_HOME%"=="" goto error1 - call :set_args -) - -rem We use the value of the JAVACMD environment variable if defined -set _JAVACMD=%JAVACMD% -if "%_JAVACMD%"=="" set _JAVACMD=java - -rem We use the value of the JAVACCMD environment variable if defined -set _JAVACCMD=%JAVACCMD% -if "%_JAVACCMD%"=="" set _JAVACCMD=javac - -rem We use the value of the JAVA_OPTS environment variable if defined -set _JAVA_OPTS=%JAVA_OPTS% -if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx1024M -Xms64M - -rem We use the value of the SCALAC_OPTS environment variable if defined -set _SCALAC_OPTS=%SCALAC_OPTS% -if "%_SCALAC_OPTS%"=="" set _SCALAC_OPTS=-deprecation - -set _EXTENSION_CLASSPATH= -if "%_EXTENSION_CLASSPATH%"=="" ( - if exist "%_SCALA_HOME%\lib\scala-partest.jar" ( - for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" - if "%OS%"=="Windows_NT" ( - for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" - ) - ) else if exist "%_SCALA_HOME%\build\pack\lib\scala-partest.jar" ( - for %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" - if "%OS%"=="Windows_NT" ( - for /d %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" - ) - ) -) - -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%_JAVACCMD%" - -rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS% -%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS% -goto end - -rem ########################################################################## -rem # subroutines - -:add_cpath - if "%_EXTENSION_CLASSPATH%"=="" ( - set _EXTENSION_CLASSPATH=%~1 - ) else ( - set _EXTENSION_CLASSPATH=%_EXTENSION_CLASSPATH%;%~1 - ) -goto :eof - -rem Variable "%~dps0" works on WinXP SP2 or newer -rem (see http://support.microsoft.com/?kbid=833431) -rem set _SCALA_HOME=%~dps0.. -:set_home - set _BIN_DIR= - for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi - set _SCALA_HOME=%_BIN_DIR%.. -goto :eof - -:set_args - set _ARGS= - :loop - rem Argument %1 may contain quotes so we use parentheses here - if (%1)==() goto :eof - set _ARGS=%_ARGS% %1 - shift - goto loop - -rem ########################################################################## -rem # errors - -:error1 -echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory. -goto end - -:end -if "%OS%"=="Windows_NT" @endlocal -exit /b %errorlevel% +@echo off + +rem ########################################################################## +rem # Scala code runner 2.9.1.final +rem ########################################################################## +rem # (c) 2002-2011 LAMP/EPFL +rem # +rem # This is free software; see the distribution for copying conditions. +rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +rem # PARTICULAR PURPOSE. +rem ########################################################################## + +rem We adopt the following conventions: +rem - System/user environment variables start with a letter +rem - Local batch variables start with an underscore ('_') + +if "%OS%"=="Windows_NT" ( + @setlocal + call :set_home + set _ARGS=%* +) else ( + set _SCALA_HOME="%SCALA_HOME%" + rem The following line tests SCALA_HOME instead of _SCALA_HOME, because + rem the above change to _SCALA_HOME is not visible within this block. + if "%SCALA_HOME%"=="" goto error1 + call :set_args +) + +rem We use the value of the JAVACMD environment variable if defined +set _JAVACMD=%JAVACMD% +if "%_JAVACMD%"=="" set _JAVACMD=java + +rem We use the value of the JAVACCMD environment variable if defined +set _JAVACCMD=%JAVACCMD% +if "%_JAVACCMD%"=="" set _JAVACCMD=javac + +rem We use the value of the JAVA_OPTS environment variable if defined +set _JAVA_OPTS=%JAVA_OPTS% +if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx1024M -Xms64M + +rem We use the value of the SCALAC_OPTS environment variable if defined +set _SCALAC_OPTS=%SCALAC_OPTS% +if "%_SCALAC_OPTS%"=="" set _SCALAC_OPTS=-deprecation + +set _EXTENSION_CLASSPATH= +if "%_EXTENSION_CLASSPATH%"=="" ( + if exist "%_SCALA_HOME%\lib\scala-partest.jar" ( + for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" + if "%OS%"=="Windows_NT" ( + for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" + ) + ) else if exist "%_SCALA_HOME%\build\pack\lib\scala-partest.jar" ( + for %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" + if "%OS%"=="Windows_NT" ( + for /d %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" + ) + ) +) + +set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%_JAVACCMD%" + +rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS% +%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS% +goto end + +rem ########################################################################## +rem # subroutines + +:add_cpath + if "%_EXTENSION_CLASSPATH%"=="" ( + set _EXTENSION_CLASSPATH=%~1 + ) else ( + set _EXTENSION_CLASSPATH=%_EXTENSION_CLASSPATH%;%~1 + ) +goto :eof + +rem Variable "%~dps0" works on WinXP SP2 or newer +rem (see http://support.microsoft.com/?kbid=833431) +rem set _SCALA_HOME=%~dps0.. +:set_home + set _BIN_DIR= + for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi + set _SCALA_HOME=%_BIN_DIR%.. +goto :eof + +:set_args + set _ARGS= + :loop + rem Argument %1 may contain quotes so we use parentheses here + if (%1)==() goto :eof + set _ARGS=%_ARGS% %1 + shift + goto loop + +rem ########################################################################## +rem # errors + +:error1 +echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory. +goto end + +:end +if "%OS%"=="Windows_NT" @endlocal +exit /b %errorlevel% diff --git a/test/pending/neg/macro-invalidusage-badbounds-b.check b/test/pending/neg/macro-invalidusage-badbounds-b.check index fd0b64533e..277f407d38 100644 --- a/test/pending/neg/macro-invalidusage-badbounds-b.check +++ b/test/pending/neg/macro-invalidusage-badbounds-b.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String] - foo[Int] - ^ -one error found +Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String] + foo[Int] + ^ +one error found diff --git a/test/pending/neg/reify_packed.check b/test/pending/neg/reify_packed.check index adba330d56..f26b902896 100644 --- a/test/pending/neg/reify_packed.check +++ b/test/pending/neg/reify_packed.check @@ -1,4 +1,4 @@ -reify_packed.scala:6: error: implementation restriction: cannot reify block of type List[_$1] that involves a type declared inside the block being reified. consider casting the return value to a suitable type. - reify { - ^ -one error found +reify_packed.scala:6: error: implementation restriction: cannot reify block of type List[_$1] that involves a type declared inside the block being reified. consider casting the return value to a suitable type. + reify { + ^ +one error found diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check index 5af32f38e0..e7cb9c367b 100644 --- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check +++ b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check @@ -1,6 +1,6 @@ -openImplicits are: List() -enclosingImplicits are: List((List[Int],scala.this.Predef.implicitly[List[Int]])) -typetag is: TypeTag[Nothing] -openImplicits are: List() -enclosingImplicits are: List((List[String],Test.this.bar[String])) -typetag is: TypeTag[Nothing] +openImplicits are: List() +enclosingImplicits are: List((List[Int],scala.this.Predef.implicitly[List[Int]])) +typetag is: TypeTag[Nothing] +openImplicits are: List() +enclosingImplicits are: List((List[String],Test.this.bar[String])) +typetag is: TypeTag[Nothing] diff --git a/test/pending/run/macro-reify-tagless-b.check b/test/pending/run/macro-reify-tagless-b.check index 49acd94ad6..61ebb4e547 100644 --- a/test/pending/run/macro-reify-tagless-b.check +++ b/test/pending/run/macro-reify-tagless-b.check @@ -1,3 +1,3 @@ error: macro must not return an expr that contains free type variables (namely: T). have you forgot to use c.TypeTag annotations for type parameters external to a reifee? - -java.lang.Error: reflective compilation has failed + +java.lang.Error: reflective compilation has failed diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-notags.check b/test/pending/run/macro-reify-typetag-hktypeparams-notags.check index db8a19d5f7..53acc9184c 100644 --- a/test/pending/run/macro-reify-typetag-hktypeparams-notags.check +++ b/test/pending/run/macro-reify-typetag-hktypeparams-notags.check @@ -1,2 +1,2 @@ -TypeTag(C[T]) -TypeTag(List[C[T]]) +TypeTag(C[T]) +TypeTag(List[C[T]]) diff --git a/tools/get-scala-commit-date.bat b/tools/get-scala-commit-date.bat index 2a75073633..e169de1b04 100644 --- a/tools/get-scala-commit-date.bat +++ b/tools/get-scala-commit-date.bat @@ -1,9 +1,9 @@ -@echo off -for %%X in (bash.exe) do (set FOUND=%%~$PATH:X) -if defined FOUND ( - bash "%~dp0\get-scala-commit-date" -) else ( - rem echo this script does not work with cmd.exe. please, install bash - echo unknown - exit 1 +@echo off +for %%X in (bash.exe) do (set FOUND=%%~$PATH:X) +if defined FOUND ( + bash "%~dp0\get-scala-commit-date" +) else ( + rem echo this script does not work with cmd.exe. please, install bash + echo unknown + exit 1 ) \ No newline at end of file diff --git a/tools/get-scala-commit-sha.bat b/tools/get-scala-commit-sha.bat index 390e2d99d0..1eaffc0a15 100644 --- a/tools/get-scala-commit-sha.bat +++ b/tools/get-scala-commit-sha.bat @@ -1,9 +1,9 @@ -@echo off -for %%X in (bash.exe) do (set FOUND=%%~$PATH:X) -if defined FOUND ( - bash "%~dp0\get-scala-commit-sha" -) else ( - rem echo this script does not work with cmd.exe. please, install bash - echo unknown - exit 1 +@echo off +for %%X in (bash.exe) do (set FOUND=%%~$PATH:X) +if defined FOUND ( + bash "%~dp0\get-scala-commit-sha" +) else ( + rem echo this script does not work with cmd.exe. please, install bash + echo unknown + exit 1 ) \ No newline at end of file -- cgit v1.2.3