summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adding SHA resolve to the SBT build so that we don't need the push/pull ↵Josh Suereth2011-12-053-2/+61
| | | | binary libs script anymore. Only pull is implemented.
* Merge branch 'master' into xsbtJosh Suereth2011-12-05125-11/+1241
|\
| * Disabled non-deterministic tests.Paul Phillips2011-12-0561-0/+0
| | | | | | | | | | | | Everyone's favorite "will they or won't they" tests, akka and timeofday. They will be welcomed back into the fold once they can stick to a decision on whether to pass or fail.
| *-. Merge remote-tracking branches 'kepler/topic/reifycopypaste' and ↵Paul Phillips2011-12-0560-1/+1201
| |\ \ | | | | | | | | | | | | 'kepler/topic/reifytests' into develop
| | | * Another test pack for reflectionEugene Burmako2011-12-0559-0/+1200
| | | | | | | | | | | | | | | | Also see https://github.com/scala/scala/pull/25.
| | * | A minor fix to -Yreify-copypaste.Eugene Burmako2011-12-051-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Empty modifiers are now correctly printed out as "Modifiers()" instead of annoyingly verbose "Modifiers(Set(), newTermName(""), List())". No review.
| * | Don't generate redundant interfaces.Paul Phillips2011-12-051-1/+13
| | | | | | | | | | | | | | | Dropped redundant parents during bytecode generation to ease trouble on android. Closes SI-5278.
| * | Merge remote-tracking branch 'szeiger/fix/scala-script-on-mingw'Paul Phillips2011-12-051-5/+17
| |\ \
| | * | Fix path mangling for 'scala' shell script on MinGW/MSYS.Stefan Zeiger2011-12-051-5/+17
| | |/
| * | Merge remote-tracking branch 'szeiger/fix/windows-git-revision'Paul Phillips2011-12-051-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | tools/get-scala-revision.bat should have the same logic as tools/get-scala-revision, but I'm afraid to try to implement an if/then/else in a windows batch file. Contributions welcome.
| | * | Fix build on Windows.Stefan Zeiger2011-12-051-1/+0
| | |/ | | | | | | | | | a289465c70630719cbd3a74edf5502a156ef83c4 broke get-scala-revision.bat.
| * / Tweaks to get-scala-revision.Paul Phillips2011-12-052-3/+10
| |/ | | | | | | | | | | | | | | Reference to git head is supposed to be HEAD, not head. Also apparently [[ <test> ]] is a bashism so it's [ <test> ]. Made name generation robust against the absence of the dev tag; it will generate a similar name even if it's not there, minus the part it can't determine without it.
* | *.properties files are now generated more oftenJosh Suereth2011-12-051-3/+11
| | | | | | | | (on git SHA change *and* clean instead of just clean)
* | Fixed mechanisms which pulls scala revision for properties file.Josh Suereth2011-12-052-3/+7
| |
* | Step one towards using project revision to buildJosh Suereth2011-12-055-17/+31
| |
* | Merge branch 'master' into xsbtPaul Phillips2011-12-0470-120/+987
|\|
| * Use git-describe to create build string.Paul Phillips2011-12-043-51/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Created dev tag which is the merge-base of master and 2.9.1 (merge-base is the last common commit), and told ant to generate build strings based on that. So distributions look like scala-2.10.0.dev-1289-gbba3918 Where the 1289 means you are 1289 commits ahead of "dev" and the last segment (minus the g) is the sha-1 hash. This no doubt breaks windows even further. Help getting it back on its feet greatly appreciated.
| * Merge remote-tracking branch 'kepler/topic/reifytests'Paul Phillips2011-12-0428-0/+352
| |\
| | * Test pack for various flavors of reflection.Eugene Burmako2011-12-0528-0/+352
| | |
| * | Enabled continuations plugin by default.Paul Phillips2011-12-043-15/+12
| | | | | | | | | | | | | | | | | | We're not buying anything with it off by default. Added a -P:continuations:disable option to disable. -P:continuations:enable lives on as a no-op. Review by @odersky.
| * | Merge remote-tracking branch 'origin/develop'Paul Phillips2011-12-040-0/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: build.xml
| | * | Revert "Fixes the annoying spaces between name, type params and params in ↵Paul Phillips2011-12-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScalaDoc." This reverts commit 086b558f2d025323c86226b2560578c50ee48b84. It causes two scaladoc tests to fail; the scaladoc tests are almost completely opaque and I have no time to reverse engineer them.
| | | |
| | | \
| | | \
| | | \
| | | \
| | | \
| | *-----. \ Merge remote-tracking branches 'dcsobral/parser/NoSuccessMessages', ↵Paul Phillips2011-12-0212-15/+295
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'dcsobral/parserFilter', 'soc/library-range-sum', 'szeiger/feature/enumeration-valueset', 'szeiger/issue/5117' and 'jsuereth/pull-binary-error-message' into develop
| | | | | | * | Added better warning message if you've forgotten to run pull-binary-libs.sh ↵Josh Suereth2011-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after initial checkout.
| | | * | | | | Add filter/withFilter method to Parser, to complement map and flatMap when usedDaniel Capo Sobral2011-12-025-0/+51
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in for comprehensions. This is required when pattern matching is used on the result of the generators. It is implemented through a new filterWithError method on ParseResult. Contributed by: Daniel C. Sobral
| | * / | | | Add withErrorMessage and withFailureMessage to Parsers.Parser,Daniel C. Sobral2011-12-023-0/+95
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | which can be used to reliably override the default no success messages.
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge remote-tracking branches 'kepler/topic/reifyclasses' and ↵Paul Phillips2011-12-049-12/+36
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'ijuma/feature/signum' into develop
| | | * | | | | Delegate to Java's implementation of signum for Long and Int.Ismael Juma2011-12-032-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Java implementation is faster as it doesn't have branches. java.lang.Math includes implementations of signum for Double and Float, but I didn't change the ones in scala.math because there is a difference on how negative zero is handled.
| | * | | | | | Reification of classes now produces trees that can be compiled and run.Eugene Burmako2011-12-047-3/+18
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple minor fixes to Martin's implementation of reflection infrastructure. Dominating theme is allowing for the fact that compilation via reflection involves numerous exports/imports between various reflection universes. Fixes SI-5230. Review by @odersky.
| * | | | | | Add a mnemonic to help remember what's the difference between +:Daniel C. Sobral2011-12-042-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and :+, plus one for ++:.
| * | | | | | Tweaked ident suggestions.Paul Phillips2011-12-048-28/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rolled damaru-levenshtein algorithm back to my original "pure" version. Cut max distance to 1. Turned on by default because now it offers nothing unexpected, and removed short-lived -Ysuggest-idents option.
| * | | | | Added -Ysuggest-idents.Paul Phillips2011-12-037-15/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest possible alternatives when an identifier is not in scope. % scala -Ysuggest-idents scala> import scala.collection.mutable._ import scala.collection.mutable._ scala> new MistBuffer <console>:11: error: not found: type MistBuffer (similar: ListBuffer, Buffer) new MistBuffer ^ Too bad, no MistBuffer. We'll settle for ListBuffer.
| * | | | | Eliminated redundant error message.Paul Phillips2011-12-034-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No secondary "reassignment to val" for unknown identifiers in assignment position.
| * | | | | Fixing wrong-testing test.Paul Phillips2011-12-021-1/+1
| | | | | |
| * | | | | Tweaking ant bootstrap download.Paul Phillips2011-12-021-2/+2
| |/ / / /
| * | | | Have ant auto-download the bootstrap libraries.Paul Phillips2011-12-021-3/+11
| | | | | | | | | | | | | | | | | | | | This probably doesn't work on windows, help appreciated.
| * | | | Test case closes SI-4758.Paul Phillips2011-12-021-0/+17
| | | | |
| * | | | Test case closes SI-5084.Paul Phillips2011-12-021-0/+5
| | | | |
| * | | | Revert "Fixes the annoying spaces between name, type params and params in ↵Paul Phillips2011-12-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScalaDoc." This reverts commit 086b558f2d025323c86226b2560578c50ee48b84. It causes two scaladoc tests to fail; the scaladoc tests are almost completely opaque and I have no time to reverse engineer them.
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----. \ \ \ Merge remote-tracking branches 'dcsobral/parser/NoSuccessMessages', ↵Paul Phillips2011-12-0212-15/+295
| |\ \ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| | 'dcsobral/parserFilter', 'soc/library-range-sum', 'szeiger/feature/enumeration-valueset', 'szeiger/issue/5117' and 'jsuereth/pull-binary-error-message' into develop
| | | | | * | Add pull-binary-libs.sh warning.Josh Suereth2011-12-021-0/+2
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Added better warning message if you've forgotten to run pull-binary-libs.sh after initial checkout.
| | | | * | Make Enumeration.ValueSet SerializableStefan Zeiger2011-12-022-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Closes SI-5117.
| | | | * | Enumeration and Enumeration.ValueSet improvementsStefan Zeiger2011-12-023-15/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make Enumeration.ValueSet a SortedSet and back it by a BitSet - Add toBitMask and fromBitMask methods for value sets - Add an Ordering for the values - Deprecate names seq in the Enumeration constructor - Add + method to Value for easy ValueSet creation
| | | * | | Makes Range#sum an O(1) operation instead of an O(n) one.Simon Ochsenreither2011-12-023-0/+128
| | | |/ / | | | | | | | | | | | | | | | Partially fixes SI-4658. NumericRange stays slow, thanks to the brilliant idea that Numeric doesn't need a division operation.
| | * | / Add filter/withFilter method to ParserDaniel Capo Sobral2011-12-025-0/+51
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Complement map and flatMap when used in for comprehensions. This is required when pattern matching is used on the result of the generators. It is implemented through a new filterWithError method on ParseResult.
| * / | Add withErrorMessage/withFailureMessage to Parser.Daniel C. Sobral2011-12-023-0/+95
| |/ / | | | | | | | | | Can be used to reliably override the default no success messages.
* | | Merge branch 'master' into xsbtJosh Suereth2011-12-0223-357/+15580
|\| |
| | \
| | \
| *-. \ Merge remote-tracking branches 'szeiger/issue/2196', 'soc/SI-3481' and ↵Paul Phillips2011-12-023-4/+60
| |\ \ \ | | | | | | | | | | | | | | | 'soc/scaladoc-spacing' into develop
| | | * | Fixes the annoying spaces between name, type params and params in ScalaDoc.Simon Ochsenreither2011-12-021-4/+3
| | | |/
| | * / Tests for SI-3481.Simon Ochsenreither2011-12-022-0/+57
| | |/ | | | | | | | | | Closes SI-3481.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-05 20:35:23 +0000