Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Revert "chore: update Scala 2 version" #4916

Merged
merged 1 commit into from Nov 14, 2022
Merged

fix: Revert "chore: update Scala 2 version" #4916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions AUTHORS.md
View file
Open in desktop
Expand Up @@ -50,5 +50,4 @@ By adding your name to this document, you agree to release all your contribution
- [Kengo TODA](http://github.com/KengoTODA/)
- [Darius Tan](https://github.com/thinking-tower)
- [Paul Butcher](https://github.com/paulbutcher)
- [Daniel Anker Hermansen](https://github.com/Daniel-Anker-Hermansen)
- [Stéphane Micheloud](https://github.com/michelou)
- [Daniel Anker Hermansen](https://github.com/Daniel-Anker-Hermansen)
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Expand Up @@ -12,8 +12,8 @@ repositories {
}

dependencies {
implementation 'org.scala-lang:scala-library:2.13.10'
implementation 'org.scala-lang:scala-reflect:2.13.10'
implementation 'org.scala-lang:scala-library:2.13.5'
implementation 'org.scala-lang:scala-reflect:2.13.5'

implementation files('lib/org.java_websocket-1.3.9.jar')
implementation files('lib/org.jline-3.5.1.jar')
Expand Down
8 changes: 4 additions & 4 deletions main/src/ca/uwaterloo/flix/language/phase/Weeder.scala
View file
Open in desktop
Expand Up @@ -1326,10 +1326,10 @@ object Weeder {
mapN(visitExp(exp1, senv), visitExp(exp2, senv)) {
case (e1, e2) =>
val loc = mkSL(sp1, sp2)
val enum0 = Name.mkQName("List", sp1, sp2)
val enum = Name.mkQName("List", sp1, sp2)
val tag = Name.Ident(sp1, "Cons", sp2)
val exp = WeededAst.Expression.Tuple(List(e1, e2), loc)
WeededAst.Expression.Tag(Some(enum0), tag, Some(exp), loc)
WeededAst.Expression.Tag(Some(enum), tag, Some(exp), loc)
}

case ParsedAst.Expression.FAppend(exp1, sp1, sp2, exp2) =>
Expand Down Expand Up @@ -2143,10 +2143,10 @@ object Weeder {
mapN(visitPattern(pat1), visitPattern(pat2)) {
case (hd, tl) =>
val loc = mkSL(sp1, sp2)
val enum0 = Name.mkQName("List", sp1, sp2)
val enum = Name.mkQName("List", sp1, sp2)
val tag = Name.Ident(sp1, "Cons", sp2)
val pat = WeededAst.Pattern.Tuple(List(hd, tl), loc)
WeededAst.Pattern.Tag(Some(enum0), tag, pat, loc)
WeededAst.Pattern.Tag(Some(enum), tag, pat, loc)
}

}
Expand Down