Skip to content

Commit cbbe132

Browse files
committed
Adapted to scalameta changes.
1 parent c6c40e1 commit cbbe132

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

parser/shared/src/main/scala/org/sireum/lang/parser/Parser_Ext.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2017-2026,Robby, Kansas State University
2+
Copyright (c) 2017-2025, Robby, Kansas State University
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ object Parser_Ext {
3737
def parseStmt[T](text: String): T = {
3838
val reporter = Reporter.create
3939
val (dialect, input) = SlangParser.scalaDialect(isWorksheet = false)(text.value)
40-
val metap = new ScalametaParser(input)(dialect, scala.meta.parsers.ParserOptions.default)
40+
val metap = new ScalametaParser(input)(dialect)
4141
val stat = Try(metap.parseStat()) match {
4242
case Success(s) => s
4343
case Failure(e) => err(e.getMessage)
@@ -61,7 +61,7 @@ object Parser_Ext {
6161
def parseExp[T](text: String): T = {
6262
val reporter = Reporter.create
6363
val (dialect, input) = SlangParser.scalaDialect(isWorksheet = false)(text.value)
64-
val metap = new ScalametaParser(input)(dialect, scala.meta.parsers.ParserOptions.default)
64+
val metap = new ScalametaParser(input)(dialect)
6565
val term = Try(metap.parseTerm()) match {
6666
case Success(t) => t
6767
case Failure(e) => err(e.getMessage)
@@ -84,7 +84,7 @@ object Parser_Ext {
8484

8585
def parseExpOpt(fileUriOpt: Option[String], text: String, isTruthTable: B, reporter: Reporter): Option[lang.ast.Exp] = {
8686
val (dialect, input) = SlangParser.scalaDialect(isWorksheet = false)(text.value)
87-
val metap = new ScalametaParser(input)(dialect, scala.meta.parsers.ParserOptions.default)
87+
val metap = new ScalametaParser(input)(dialect)
8888
val term = Try(metap.parseTerm()) match {
8989
case Success(t) => t
9090
case Failure(e) => err(e.getMessage)
@@ -105,7 +105,7 @@ object Parser_Ext {
105105

106106
def parseSequentOpt(fileUriOpt: Option[String], text: String, isTruthTable: B, reporter: Reporter): Option[lang.ast.Sequent] = {
107107
val (dialect, input) = SlangParser.scalaDialect(isWorksheet = false)(text.value)
108-
val metap = new ScalametaParser(input)(dialect, scala.meta.parsers.ParserOptions.default)
108+
val metap = new ScalametaParser(input)(dialect)
109109
val term = Try(metap.parseTerm()) match {
110110
case Success(t) => t
111111
case Failure(e) => err(e.getMessage)
@@ -125,12 +125,12 @@ object Parser_Ext {
125125
}
126126

127127
def parseTopUnit[T](
128-
text: String,
129-
isWorksheet: B,
130-
isDiet: B,
131-
fileUriOpt: Option[String],
132-
reporter: Reporter
133-
): Option[T] =
128+
text: String,
129+
isWorksheet: B,
130+
isDiet: B,
131+
fileUriOpt: Option[String],
132+
reporter: Reporter
133+
): Option[T] =
134134
SlangParser(isWorksheet, isDiet, fileUriOpt, text.value, reporter).unitOpt.map(_.asInstanceOf[T])
135135

136136
@pure def detectSlang(fileUriOpt: Option[String], txt: String): (B, String, String) = {

parser/shared/src/main/scala/org/sireum/lang/parser/SlangParser.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class SlangParser(
260260
val fileUri = fileUriOpt.getOrElse("").value
261261
if (fileUri.endsWith(".scala") || fileUri.endsWith(".sc") || fileUri.endsWith(".slang") || fileUri.endsWith(".cmd") || (fileUri == "" && hashSireum)) {
262262
if (hashSireum || fileUri.endsWith(".slang")) {
263-
val parser = new ScalametaParser(input)(dialect, scala.meta.parsers.ParserOptions.default)
263+
val parser = new ScalametaParser(input)(dialect)
264264
translateSource(parser.parseSource())
265265
} else Result(text, hashSireum, None())
266266
} else if (fileUriOpt.isEmpty || fileUri.endsWith(".logika")) {
@@ -270,7 +270,7 @@ class SlangParser(
270270
case _ => Result(text, hashSireum, None())
271271
}
272272
} else {
273-
val parser = new ScalametaParser(input)(dialect, scala.meta.parsers.ParserOptions.default)
273+
val parser = new ScalametaParser(input)(dialect)
274274
val oldIn = parser.in
275275
parser.in = oldIn.fork
276276
parser.next()

0 commit comments

Comments
 (0)