stan/FeatherweightTypeInference
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove keywords, add this Parser Tests

Browse Source
This commit is contained in:
JanUlrich 2022-03-07 14:59:17 +01:00
parent fc8460ea29
commit 39c5a0527d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/hb/dhbw/Parser.scala
View File

@ -8,8 +8,7 @@ final case class ParserMethod(retType: Option[NType], name: String, params: List
final case class NType(name: String, params: List[NType])
object Parser {
val keywords = Set("class", "new", "extends", "return", "this")
def kw[_: P](s: String) = s ~~ !(letter | digit | "_" | "'")
def kw[_: P](s: String) = s ~~ !(letter | digit)
def letter[_: P] = P( lowercase | uppercase )
def lowercase[_: P] = P( CharIn("a-z") )
@ -17,7 +16,7 @@ object Parser {
def digit[_: P] = P( CharIn("0-9") )
def number[_: P]: P[Int] = P( CharIn("0-9").repX(1).!.map(_.toInt) )
def ident[_: P]: P[String] =
P( (letter) ~~ (letter | digit).repX ).!.filter(!keywords(_))
P( (letter) ~~ (letter | digit).repX ).!
def fieldVar[_: P]: P[Expr] = P( ".".! ~ ident ).map(ite => FieldVar(null, ite._2) )
def prefixMethodCall[_: P]: P[Expr] = P( "." ~ methodCall)

5
src/test/scala/ParserTest.scala
View File

@ -43,4 +43,9 @@ class ParserTest extends FunSuite {
println(fastparse.parse("<Test extends Object>", hb.dhbw.Parser.genericParamList(_)))
println(fastparse.parse("<Test extends Object, Test<Object> extends Test<Object>>", hb.dhbw.Parser.genericParamList(_)))
}
test("Parser.this"){
println(fastparse.parse("this", hb.dhbw.Parser.expr(_)))
println(fastparse.parse("this.m()", hb.dhbw.Parser.expr(_)))
}
}