summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove tools/remotetestJason Zaugg2013-10-281-230/+0
| | | | I suggest using the scala-checkin-manual Jenkins job instead.
* Remove tools/test-renamerJason Zaugg2013-10-281-82/+0
| | | | | | | | | | It delivered us the terser 't1234' naming convention for test cases. Its work is done. This commit does the bidding of the script's author: > Despite its shameful hackiness, checked in for posterity. > It'll live on forever in the git history; then I can remove it.
* Remove tools/updatescalacheckJason Zaugg2013-10-281-130/+0
| | | | We no longer maintain a fork.
* Remove outdated build scripts.Jason Zaugg2013-10-282-60/+0
| | | | | | | | | | | Only used on the 2.9.x series: /code/jenkins-config grep -R epfl-build . ./jobs/scala-nightly-checkinit-2.9.x/config.xml: <command>./tools/epfl-build 2.9.x -Xcheckinit</command> ./jobs/scala-nightly-main-2.9.x/config.xml:./tools/epfl-build 2.9.x &amp;&amp; ./tools/epfl-publish 2.9.x /code/jenkins-config grep -R epfl-publish . ./jobs/scala-nightly-main-2.9.x/config.xml:./tools/epfl-build 2.9.x &amp;&amp; ./tools/epfl-publish 2.9.x
* Remove tools/make-release-notesJason Zaugg2013-10-281-129/+0
| | | | This has lived in scala/make-release-notes for some time.
* Merge pull request #3080 from retronym/topic/empty-checkJason Zaugg2013-10-2764-16/+0
|\ | | | | Check file maintainence
| * Remove orphaned check files and flags files.Jason Zaugg2013-10-275-16/+0
| | | | | | | | (for f in $(find test -name '*.check' -o -name '*.flags'); do bare=$(echo $f | sed -E 's/\.\w+$//'); ([[ -f "$bare" ]] || [[ -d "$bare" ]] || [[ -f "$bare.scala" ]] || [[ -f "$bare.test" ]] || echo $f) done;) | xargs rm
| * Remove empty check files and flags files.Jason Zaugg2013-10-2759-0/+0
|/ | | | for f in $(find test -name '*.check' -o -name '*.flags'); do [[ $(wc -c $f | sed -E 's/ *([0-9]+).*/\1/') == "0" ]] && rm $f; done
* Merge pull request #3073 from retronym/ticket/7928Jason Zaugg2013-10-252-1/+21
|\ | | | | Favour module accessors symbols in rebind
| * SI-7928 Favour module accessors symbols in rebindJason Zaugg2013-10-232-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Refchecks tree transformer transforms a nested modules that overrides a method into a pair of symbols: the module itself, and an module accessor that matches the overridden symbol. [[syntax trees at end of typer]] // test1.scala package <empty> { abstract trait C2 extends scala.AnyRef { def O1: Any }; class C1 extends AnyRef with C2 { object O1 extends scala.AnyRef } } [[syntax trees at end of refchecks]] // test1.scala package <empty> { abstract trait C2 extends scala.AnyRef { def O1: Any }; class C1 extends AnyRef with C2 { object O1 extends scala.AnyRef @volatile <synthetic> private[this] var O1$module: C1.this.O1.type = _; <stable> def O1: C1.this.O1.type = { C1.this.O1$module = new C1.this.O1.type(); C1.this.O1$module } } } When constructing a TypeRef or SingleType with a prefix and and a symbol, the factory methods internally use `rebind` to see if the provided symbol should be replaced with an overriding symbol that is available in that prefix. Trying this out in the REPL is a bit misleading, because even if you change phase to `refchecks`, you won't get the desired results because the transform is not done in an InfoTransformer. scala> val O1 = typeOf[C1].decl(TermName("O1")) O1: $r.intp.global.Symbol = object O1 scala> typeRef(typeOf[C2], O1, Nil) res13: $r.intp.global.Type = C2#O1 scala> res13.asInstanceOf[TypeRef].sym.owner res14: $r.intp.global.Symbol = class C1 But debugging the test case, we get into `rebind` during an AsSeenFrom which is where we crashed when `suchThat` encountered the overloaded module and module accessor symbols: typeOf[OuterObject.Inner.type].memberType(symbolOf[InnerTrait.Collection]) ... singleTypeAsSeen(OuterTrait.this.Inner.type) val SingleType(pre, sym) = tp // pre = OuterTrait.this.type // sym = OuterTrait.Inner val pre1 = this(pre) // OuterObject.type singleType(pre1, sym) rebind(pre1, sym) // was crashing, now OuterObject.Inner } This commit excludes the module symbol from symbol lookup in the prefix in rebind.
* | Merge pull request #3079 from jamesward/fix/ec-implicit-errorJames Iry2013-10-251-1/+1
|\ \ | | | | | | More clear implicitNotFound error for ExecutionContext
| * | More clear implicitNotFound error for ExecutionContextJames Ward2013-10-241-1/+1
| | |
* | | Merge pull request #3077 from retronym/topic/phase-descAdriaan Moors2013-10-246-6/+6
|\ \ \ | | | | | | | | Update description of explicitouter phase.
| * | | Update description of explicitouter phase.Jason Zaugg2013-10-246-6/+6
| | | | | | | | | | | | | | | | Patern translation now happens earlier.
* | | | Merge pull request #3006 from ivmaykov/masterAdriaan Moors2013-10-242-0/+58
|\ \ \ \ | |_|/ / |/| | | SI-7883 - don't iterate over all keys in MapWrapper.containsKey()
| * | | SI-7883: Added a comment per CR feedback from @adriaanm, @IchoranIlya Maykov2013-10-031-0/+3
| | | |
| * | | SI-7883 - don't iterate over all keys in MapWrapper.containsKey()Ilya Maykov2013-10-012-0/+55
| | | |
* | | | Merge pull request #3074 from Jentsch/filterInDocsJason Zaugg2013-10-241-33/+38
|\ \ \ \ | |_|/ / |/| | | Prevent useless filter operation in docs
| * | | Prevent useless filter operation in docsJentsch2013-10-231-33/+38
| | | |
* | | | Merge pull request #3027 from etaty/patch-2Jason Zaugg2013-10-231-1/+1
|\ \ \ \ | | | | | | | | | | IterableLike grouped : fix documentation
| * | | | IterableLike.grouped() : More explicit documentationValerian2013-10-141-1/+1
| | | | |
| * | | | IterableLike grouped : fix documentationValerian2013-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | scala> Seq(1,2,3).grouped(2).toList res1: List[Seq[Int]] = List(List(1, 2), List(3))
* | | | | Merge pull request #3026 from retronym/ticket/3871Jason Zaugg2013-10-234-0/+242
|\ \ \ \ \ | | | | | | | | | | | | Tests for protected access
| * | | | | SI-3871 Testing protected access against the specJason Zaugg2013-10-232-0/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've marked a few minor cases in the test with !!! where I believe the behaviour goes beyond the spec.
| * | | | | SI-3871 Missing test case for protected bug.Jason Zaugg2013-10-092-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | c39f26382dddaa7 fixed the bug but didn't commit a test case.
* | | | | | Merge pull request #3039 from huitseeker/filter-partest-JAVA_OPTIONSJason Zaugg2013-10-231-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Filter JVM debug output for custom options in partest
| * | | | | | Filter JVM debug output for custom options in partestFrançois Garillot2013-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Picked up _JAVA_OPTIONS line occurs on Sun's JDK as a debug output when you use that variable to set up custom VM options
* | | | | | | Merge pull request #3059 from densh/pull/si-6840Jason Zaugg2013-10-233-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-6840 fixes weird typing of quasiquote arguments
| * | | | | | | SI-6840 fixes weird typing of quasiquote argumentsDen Shabalin2013-10-193-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously quasiquote arguments were type checked against Any which caused weird inference that made splicing of complex expressions unusable: val l1 = List(q"foo") val l2 = List(q"bar") q"f(..${l1 ++ l2})" // argument type checked as Any instead of List[Tree] This is fixed by forcing compiler to type check against type variable which itself isn't used in any other way.
* | | | | | | | Merge pull request #3070 from xeno-by/topic/macro-impl-wrong-shapeJason Zaugg2013-10-2310-9/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | better macro impl shape errors
| * | | | | | | | better macro impl shape errorsEugene Burmako2013-10-2310-9/+41
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the advent of quasiquotes, we allowed both arguments and return types of macro impls to be c.Tree's (as opposed to traditional c.Expr[T]'s). This warrants an update of macro def <-> macro impl signature mismatch errors that include a printout of suggested macro impl signatures. Now along with a signature that contains exprs, we suggest another signature that has all exprs replaced by trees
* | | | | | | | Merge pull request #3068 from retronym/ticket/7020-3-1Jason Zaugg2013-10-235-12/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deterministic warnings for pattern matcher, take 2
| * | | | | | | | SI-7020 Deterministic warnings for pattern matcher, take 2Jason Zaugg2013-10-225-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous swing at determinism, ebb01e05cbe4, made decent contact but apparently didn't hit it out of the park. The test wavered every hundred or so runs, as witnessed occasionally in nightly builds or pull request validation. I setup a test to run neg/7020.scala a few hundred times, and could trigger the failure reliably. I then swept through the pattern matcher in search of HashMap and HashSet creation, and changed them all to the Linked variety. The results of that are published in retronym#ticket/7020-3 [1]. This commit represents the careful whittling down of that patch to the minimal change required to exhibit determinism. [1] https://github.com/retronym/scala/compare/ticket/7020-3
* | | | | | | | | Merge pull request #3060 from harrah/t7519-bJason Zaugg2013-10-233-0/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-7519: Additional test case covering sbt/sbt#914
| * | | | | | | | | SI-7519: Additional test case covering sbt/sbt#914Mark Harrah2013-10-203-0/+28
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3057 from xeno-by/topic/fancy-java-classesJason Zaugg2013-10-236-31/+66
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | fixes handling of fancy nested classes in runtime reflection
| * | | | | | | | fixes handling of fancy nested classes in runtime reflectionEugene Burmako2013-10-196-31/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the `jclazz.isMemberClass` check for whether we have an inner/nested class with `jclazz.getEnclosingClass != null`, because there exist classes produced by javac (see the attached jar file and the test log) which have the following properties: * They are nested within a parent class * getEnclosingClass returns a non-null value * isMemberClass returns false Previously such classes were incorrectly treated as non-nested, were incorrectly put into an enclosing package rather than an enclosing class, and had their names trimmed in the process, leading to situations when a package has multiple declarations with the same name. This is now fixed. When changing the check, we need to be careful with interpretation of what Class.getEnclosingXXX methods return. If getEnclosingClass produces a non-null result, this doesn't mean that the class is inner or nested, because getEnclosingClass is also not null for local classes (the ones with getEnclosingMethod != null || getEnclosingConstructor != null). This is expressed in the order of pattern match clauses in `sOwner`. Now when the bug is fixed, I also revert b18a2f8798b2, restoring a very important integrity check in runtime reflection, which I had to disable a couple hours ago to fix a master breakage. More details at scala-internals: https://groups.google.com/forum/#!topic/scala-internals/hcnUFk75MgQ
* | | | | | | | | Merge pull request #3071 from xeno-by/topic/temporarily-disable-sync-testsEugene Burmako2013-10-222-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | temporarily disables run/reflection-sync-subtypes
| * | | | | | | | | temporarily disables run/reflection-sync-subtypesEugene Burmako2013-10-232-0/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test has been a source of spurious failures as in, for example https://github.com/scala/scala/pull/3029#issuecomment-26811129, so I'm disabling it for the time being while I investigate the issue.
* | | | | | | | | Merge pull request #3047 from xeno-by/topic/deprecateEugene Burmako2013-10-2258-140/+186
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | deprecates raw tree manipulation facilities in macros.Context
| * | | | | | | | changes some manual tree constructions in macro tests to quasiquotesEugene Burmako2013-10-1834-100/+85
| | | | | | | | |
| * | | | | | | | deprecates raw tree manipulation facilities in macros.ContextEugene Burmako2013-10-1846-90/+151
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #3067 from retronym/ticket/7020-2Jason Zaugg2013-10-214-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Moving disabled tests to their rightful home.
| * | | | | | | | Moving disabled tests to their rightful home.Jason Zaugg2013-10-214-0/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | test/disabled, not test/files/disabled.
* | | | | | | | Merge pull request #3064 from retronym/topic/broken-windows2Jason Zaugg2013-10-202-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Platform independence for test case
| * | | | | | | | Platform independence for SI-6240 test caseJason Zaugg2013-10-202-4/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | File.pathSeparator, rather than ":"
* | | | | | | | Merge pull request #3061 from retronym/topic/fix-distJason Zaugg2013-10-201-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix problem assembling sources and docs of modules.
| * | | | | | | | Fix problem assembling sources and docs of modules.Jason Zaugg2013-10-201-2/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent commit added 'overwrite=true' to all usages of the Ant copy task. This was enough to show up a bug in our dist.src and dist.docs tasks, as was seen on the Windows build: Failed to copy: C:\Users\scala\.m2\repository\org\scala-lang\modules\scala-xml_2.11.0-M5\1.0-RC4\scala-xml_2.11.0-M5-1.0-RC4-javadoc.jar to H:\jenkins\workspace\scala-nightly-windows\dists\scala-2.11.0-20131019-064627-8848f24161\doc\scala-devel-docs\C:\Users\scala\.m2\repository\org\scala-lang\modules\scala-xml_2.11.0-M5\1.0-RC4\scala-xml_2.11.0-M5-1.0-RC4-javadoc.jar ... This commit uses a "flattening" copy to put the JARs directly into scala-devel-docs. The Ant docs note [1] this gotcha: > Note that some resources (for example the file resource) return > absolute paths as names and the result of using them without > using a nested mapper (or the flatten attribute) may not be what > you expect. These appear to be the only places we fell into the trap: ack '<file\b' --xml build.xml 1948: <file file="${scala-xml-javadoc}"/> 1949: <file file="${scala-parser-combinators-javadoc}"/> 1992: <file-sets/> 2007: <file file="${scala-xml-sources}"/> 2008: <file file="${scala-parser-combinators-sources}"/> [1] http://ant.apache.org/manual/Tasks/copy.html
* | | | | | | | Merge pull request #3062 from xeno-by/topic/broken-windowsJason Zaugg2013-10-202-2/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | hotfix for reflection tests on Windows
| * | | | | | | hotfix for reflection tests on WindowsEugene Burmako2013-10-202-2/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the Unix-specific command-line sanity check put in place in recently committed reflection tests. On Windows, something like `C:\Java\jdk1.6.0_24-x64\jre\bin\java` might be a valid command (pointing to `java.exe` or `java.bat`) even if the eponymous file does not exist.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 15:33:32 +0000