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

Remove inspection function for syntax tree nodes #200

Merged
merged 11 commits into from
Jan 2, 2024
Merged

Remove inspection function for syntax tree nodes #200

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
baa6298
Extract the inspect function as a general utility
chengluyu Dec 19, 2023
3f4db0b
Fix a bug in `inspect` to keep the consistency in future commits
chengluyu Dec 30, 2023
460a521
Replace every `toString` call of all syntax nodes with `showDbg`
chengluyu Dec 30, 2023
dcef2e2
Remove `inspect` function and replace all its calls with `toString`
chengluyu Dec 30, 2023
73b389b
Update test files of other sub-projects as well
chengluyu Dec 30, 2023
23c3645
Use a shorthand notation for `FldFlags`
chengluyu Dec 30, 2023
947ea51
Reset the number of lines of stack trace to 10
chengluyu Jan 1, 2024
e1af9db
Remove parsed output from compiler tests
chengluyu Jan 1, 2024
16187c2
Remove impudent `???` in `StatementImpl`'s `showDbg`
chengluyu Jan 1, 2024
1665c8d
Remove some reckless and arbitrary uses of wildcards
chengluyu Jan 1, 2024
fb7fc35
Remove `showDbgTop`
chengluyu Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions shared/src/main/scala/mlscript/helpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,6 @@ trait DeclImpl extends Located { self: Decl =>
case _: Def => "definition"
case _: TypeDef => "type declaration"
}
override def showDbg: Str = showHead + (this match {
case TypeDef(Als, _, _, _, _, _, _, _) => " = "; case _ => ": " }) + showBody
def showHead: Str = this match {
case Def(true, n, b, isByname) => s"rec def ${n.showDbg}"
case Def(false, n, b, isByname) => s"def ${n.showDbg}"
Expand Down Expand Up @@ -442,11 +440,6 @@ trait NuDeclImpl extends Located { self: NuDecl =>
case _: NuFunDef => "definition"
case _: NuTypeDef => "type declaration"
}
override def showDbg: Str = showHead + (this match {
case NuFunDef(_, _, _, _, L(_)) => " = "
case NuFunDef(_, _, _, _, R(_)) => ": "
case _: NuTypeDef => " "
}) + showBody
def showHead: Str = this match {
case NuFunDef(N, n, snme, _, b) => s"fun${snme.fold("")(" ("+_.name+")")} ${n.name}"
case NuFunDef(S(false), n, snme, _, b) => s"let${snme.fold("")(" "+_.name+")")} ${n.name}"
Expand Down Expand Up @@ -494,7 +487,6 @@ trait ConstructorImpl { self: Constructor =>
// def children: List[Located] = fields.map(_._2)
def describe: Str = "constructor"
// def showDbg: Str = s"constructor(${fields.map(_._1.name).mkString(", ")})"
override def showDbg: Str = s"constructor(${this.params.showElems}) ${this.body.showDbg}"
}

trait TypeNameImpl extends Ordered[TypeName] { self: TypeName =>
Expand Down Expand Up @@ -1024,7 +1016,17 @@ trait StatementImpl extends Located { self: Statement =>
case LetS(isRec, name, rhs) => s"let${if (isRec) " rec" else ""} ${name.showDbg} = ${rhs.showDbg}"
case DatatypeDefn(head, body) => s"data type ${head.showDbg} of ${body.showDbg}"
case DataDefn(head) => s"data ${head.showDbg}"
case _: Constructor | _: Term | _: Decl | _: NuDecl => ??? // Implemented in subclasses
case Constructor(params, body) => s"constructor(${params.showElems}) ${body.showDbg}"
case t: Term => t.print(false)
case d: Decl => d.showHead + (d match {
case TypeDef(Als, _, _, _, _, _, _, _) => " = ";
chengluyu marked this conversation as resolved.
Show resolved Hide resolved
case _ => ": "
}) + d.showBody
case n: NuDecl => n.showHead + (n match {
case NuFunDef(_, _, _, _, L(_)) => " = "
case NuFunDef(_, _, _, _, R(_)) => ": "
case _: NuTypeDef => " "
}) + n.showBody
}
}

Expand Down
Loading