Skip to content

Commit 1ab4a43

Browse files
jad-hamzajad-hamza
committed
Address some warnings from Scala 2.13.5
1 parent 4ba1dcf commit 1ab4a43

File tree

6 files changed

+92
-92
lines changed

6 files changed

+92
-92
lines changed

‎src/it/scala/smtlib/it/SmtLibRunnerTests.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class SmtLibRunnerTests extends AnyFunSuite with TestHelpers {
7272
val lexer = new Lexer(new FileReader(file))
7373
val parser = new Parser(lexer)
7474

75-
for(expected <- scala.io.Source.fromFile(want).getLines) {
75+
for(expected <- scala.io.Source.fromFile(want).getLines()) {
7676
val cmd = parser.parseCommand
7777
assert(cmd !== null)
7878
val res: String = interpreter.eval(cmd).toString

‎src/main/scala/smtlib/extensions/tip/Parser.scala‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
3838
override protected def parseTermWithoutParens(startPos: Position): Term = getPeekToken.kind match {
3939
case Tokens.Lambda =>
4040
eat(Tokens.Lambda)
41-
val args = parseMany(parseSortedVar _)
41+
val args = parseMany(() => parseSortedVar)
4242
val body = parseTerm
4343
Lambda(args, body)
4444

4545
case Tokens.At =>
4646
eat(Tokens.At)
47-
val (caller +: args) = parseUntil(LT.CParen, eatEnd = false)(parseTerm _)
47+
val (caller +: args) = parseUntil(LT.CParen, eatEnd = false)(() => parseTerm)
4848
Application(caller, args)
4949

5050
case Tokens.Match =>
@@ -59,7 +59,7 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
5959
Default
6060

6161
case LT.OParen =>
62-
val (sym, binders) = parseOneOrMore(parseSymbol _)
62+
val (sym, binders) = parseOneOrMore(() => parseSymbol)
6363
CaseClass(sym, binders)
6464

6565
case _ =>
@@ -82,7 +82,7 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
8282
getPeekToken.kind match {
8383
case LT.Par =>
8484
eat(LT.Par)
85-
val tps = parseMany(parseSymbol _)
85+
val tps = parseMany(() => parseSymbol)
8686
val res = parseTerm
8787
eat(LT.CParen)
8888
(Some(tps), res)
@@ -123,8 +123,8 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
123123
case LT.OParen =>
124124
eat(LT.OParen)
125125
eat(LT.Par)
126-
val tps = parseMany(parseSymbol _)
127-
val (sym, sort) = parseWithin(LT.OParen, LT.CParen)(parseDecl _)
126+
val tps = parseMany(() => parseSymbol)
127+
val (sym, sort) = parseWithin(LT.OParen, LT.CParen)(() => parseDecl)
128128
eat(LT.CParen)
129129
DeclareConstPar(tps, sym, sort)
130130
case _ =>
@@ -136,16 +136,16 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
136136
eat(LT.DeclareFun)
137137
def parseDecl: (SSymbol, Seq[Sort], Sort) = {
138138
val sym = parseSymbol
139-
val sorts = parseMany(parseSort _)
139+
val sorts = parseMany(() => parseSort)
140140
val resultSort = parseSort
141141
(sym, sorts, resultSort)
142142
}
143143
getPeekToken.kind match {
144144
case LT.OParen =>
145145
eat(LT.OParen)
146146
eat(LT.Par)
147-
val tps = parseMany(parseSymbol _)
148-
val (sym, args, resultSort) = parseWithin(LT.OParen, LT.CParen)(parseDecl _)
147+
val tps = parseMany(() => parseSymbol)
148+
val (sym, args, resultSort) = parseWithin(LT.OParen, LT.CParen)(() => parseDecl)
149149
eat(LT.CParen)
150150
DeclareFunPar(tps, sym, args, resultSort)
151151
case _ =>
@@ -159,8 +159,8 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
159159
case LT.OParen =>
160160
eat(LT.OParen)
161161
eat(LT.Par)
162-
val tps = parseMany(parseSymbol _)
163-
val funDef = parseWithin(LT.OParen, LT.CParen)(parseFunDef _)
162+
val tps = parseMany(() => parseSymbol)
163+
val funDef = parseWithin(LT.OParen, LT.CParen)(() => parseFunDef)
164164
eat(LT.CParen)
165165
DefineFunPar(tps, funDef)
166166

@@ -175,8 +175,8 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
175175
case LT.OParen =>
176176
eat(LT.OParen)
177177
eat(LT.Par)
178-
val tps = parseMany(parseSymbol _)
179-
val funDef = parseWithin(LT.OParen, LT.CParen)(parseFunDef _)
178+
val tps = parseMany(() => parseSymbol)
179+
val funDef = parseWithin(LT.OParen, LT.CParen)(() => parseFunDef)
180180
eat(LT.CParen)
181181
DefineFunRecPar(tps, funDef)
182182

@@ -192,16 +192,16 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
192192
val funDec = getPeekToken.kind match {
193193
case LT.Par =>
194194
eat(LT.Par)
195-
val tps = parseMany(parseSymbol _)
196-
val funDec = parseWithin(LT.OParen, LT.CParen)(parseFunDec _)
195+
val tps = parseMany(() => parseSymbol)
196+
val funDec = parseWithin(LT.OParen, LT.CParen)(() => parseFunDec)
197197
Left(FunDecPar(tps, funDec.name, funDec.params, funDec.returnSort))
198198
case _ =>
199199
Right(parseFunDec)
200200
}
201201
eat(LT.CParen)
202202
funDec
203203
})
204-
val (body, bodies) = parseOneOrMore(parseTerm _)
204+
val (body, bodies) = parseOneOrMore(() => parseTerm)
205205
assert(funDecs.size == bodies.size)
206206

207207
if ((funDec +: funDecs).exists(_.isLeft)) {
@@ -213,8 +213,8 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
213213

214214
case LT.DeclareDatatypes =>
215215
eat(LT.DeclareDatatypes)
216-
val tps = parseMany(parseSymbol _)
217-
val datatypes = parseMany(parseDatatypes _)
216+
val tps = parseMany(() => parseSymbol)
217+
val datatypes = parseMany(() => parseDatatypes)
218218
DeclareDatatypesPar(tps, datatypes)
219219

220220
case _ => super.parseCommandWithoutParens

‎src/main/scala/smtlib/parser/ParserCommands.scala‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
2222
Script(cmds.toList)
2323
}
2424

25-
protected def parseCommandWithoutParens: Command = nextToken.kind match {
25+
protected def parseCommandWithoutParens: Command = nextToken().kind match {
2626
case Tokens.Assert => {
2727
Assert(parseTerm)
2828
}
2929
case Tokens.CheckSat => CheckSat()
3030
case Tokens.CheckSatAssuming => {
31-
val props = parseMany(parsePropLit _)
31+
val props = parseMany(() => parsePropLit)
3232
CheckSatAssuming(props)
3333
}
3434

@@ -64,8 +64,8 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
6464
DefineFunRec(funDef)
6565
}
6666
case Tokens.DefineFunsRec => {
67-
val (funDef, funDefs) = parseOneOrMore(() => parseWithin(Tokens.OParen, Tokens.CParen)(parseFunDec _))
68-
val (body, bodies) = parseOneOrMore(parseTerm _)
67+
val (funDef, funDefs) = parseOneOrMore(() => parseWithin(Tokens.OParen, Tokens.CParen)(() => parseFunDec))
68+
val (body, bodies) = parseOneOrMore(() => parseTerm)
6969
assert(funDefs.size == bodies.size)
7070
DefineFunsRec(funDef +: funDefs, body +: bodies)
7171
}
@@ -151,7 +151,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
151151
eat(Tokens.OParen)
152152
eat(Tokens.CParen)
153153

154-
val datatypes = parseMany(parseDatatypes _)
154+
val datatypes = parseMany(() => parseDatatypes)
155155

156156
DeclareDatatypes(datatypes)
157157
}
@@ -162,7 +162,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
162162
}
163163

164164
def parseCommand: Command = if(peekToken == null) null else {
165-
val head = nextToken
165+
val head = nextToken()
166166
check(head, Tokens.OParen)
167167
val cmd = parseCommandWithoutParens
168168
eat(Tokens.CParen)
@@ -192,7 +192,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
192192
def parseFunDec: FunDec = {
193193
val name = parseSymbol
194194

195-
val sortedVars = parseMany(parseSortedVar _)
195+
val sortedVars = parseMany(() => parseSortedVar)
196196

197197
val sort = parseSort
198198

@@ -202,7 +202,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
202202
def parseFunDef: FunDef = {
203203
val name = parseSymbol
204204

205-
val sortedVars = parseMany(parseSortedVar _)
205+
val sortedVars = parseMany(() => parseSortedVar)
206206

207207
val sort = parseSort
208208

@@ -241,7 +241,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
241241

242242

243243
def parseInfoFlag: InfoFlag = {
244-
val t = nextToken
244+
val t = nextToken()
245245
val flag = t match {
246246
case Tokens.Keyword("all-statistics") => AllStatisticsInfoFlag()
247247
case Tokens.Keyword("assertion-stack-levels") => AssertionStackLevelsInfoFlag()
@@ -261,52 +261,52 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
261261
val peekPosition = peekToken.getPos
262262
val opt = peekToken match {
263263
case Tokens.Keyword("diagnostic-output-channel") =>
264-
nextToken
264+
nextToken()
265265
DiagnosticOutputChannel(parseString.value)
266266

267267
case Tokens.Keyword("global-declarations") =>
268-
nextToken
268+
nextToken()
269269
GlobalDeclarations(parseBool)
270270

271271
case Tokens.Keyword("interactive-mode") =>
272-
nextToken
272+
nextToken()
273273
InteractiveMode(parseBool)
274274
case Tokens.Keyword("print-success") =>
275-
nextToken
275+
nextToken()
276276
PrintSuccess(parseBool)
277277

278278
case Tokens.Keyword("produce-assertions") =>
279-
nextToken
279+
nextToken()
280280
ProduceAssertions(parseBool)
281281
case Tokens.Keyword("produce-assignments") =>
282-
nextToken
282+
nextToken()
283283
ProduceAssignments(parseBool)
284284
case Tokens.Keyword("produce-models") =>
285-
nextToken
285+
nextToken()
286286
ProduceModels(parseBool)
287287
case Tokens.Keyword("produce-proofs") =>
288-
nextToken
288+
nextToken()
289289
ProduceProofs(parseBool)
290290
case Tokens.Keyword("produce-unsat-assumptions") =>
291-
nextToken
291+
nextToken()
292292
ProduceUnsatAssumptions(parseBool)
293293
case Tokens.Keyword("produce-unsat-cores") =>
294-
nextToken
294+
nextToken()
295295
ProduceUnsatCores(parseBool)
296296

297297
case Tokens.Keyword("random-seed") =>
298-
nextToken
298+
nextToken()
299299
RandomSeed(parseNumeral.value.toInt)
300300

301301
case Tokens.Keyword("regular-output-channel") =>
302-
nextToken
302+
nextToken()
303303
RegularOutputChannel(parseString.value)
304304

305305
case Tokens.Keyword("reproducible-resource-limit") =>
306-
nextToken
306+
nextToken()
307307
ReproducibleResourceLimit(parseNumeral.value.toInt)
308308
case Tokens.Keyword("verbosity") =>
309-
nextToken
309+
nextToken()
310310
Verbosity(parseNumeral.value.toInt)
311311

312312
case _ =>
@@ -316,7 +316,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
316316
}
317317

318318
def parseBool: Boolean = {
319-
nextToken match {
319+
nextToken() match {
320320
case Tokens.SymbolLit("true") => true
321321
case Tokens.SymbolLit("false") => false
322322
case t => expected(t) //TODO: not sure how to tell we were expecting one of two specific symbols

0 commit comments

Comments
 (0)