Skip to content

Santises the variables containing dots #629

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

Merged
katrinafyi merged 3 commits into from
May 21, 2026
Merged

Santises the variables containing dots #629

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3520d27
Santises the variables containing dots
JTrenerry May 19, 2026
8f5b6dc
fmt :(
JTrenerry May 19, 2026
2956cd2
change "" to "__"
JTrenerry May 19, 2026
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
27 changes: 19 additions & 8 deletions src/main/scala/translating/PrettyPrinter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ import scala.collection.mutable

private val localSigils = false

/*
Santises variables names

BinCaml requires that there are no dots in variable names
*/
def santise_var_name(name: String): String =
return name.replace(".", "__")

object PrettyPrinter {

type PrettyPrintable = Program | Procedure | Statement | Jump | Command | Block | Expr | IRContext
Expand Down Expand Up @@ -569,18 +577,21 @@ class BasilIRPrettyPrinter(
case m: MapType => s"(${vtype(m.param)} -> ${vtype(m.result)})"
}

override def vrvar(e: Variable): PPProg[Variable] = e match {
case l: LocalVar =>
val sigil = if localSigils then Sigil.BASIR.localVar else ""
BST(s"${sigil}${e.name}:${vtype(e.getType)}")
case l: Global => BST(s"${Sigil.BASIR.globalVar}${e.name}:${vtype(e.getType)}")
}
override def vrvar(e: Variable): PPProg[Variable] =
val namefixed = santise_var_name(e.name)
e match {
case l: LocalVar =>
val sigil = if localSigils then Sigil.BASIR.localVar else ""
BST(s"${sigil}${namefixed}:${vtype(e.getType)}")
case l: Global => BST(s"${Sigil.BASIR.globalVar}${namefixed}:${vtype(e.getType)}")
}
override def vlvar(e: Variable): PPProg[Variable] = {
val namefixed = santise_var_name(e.name)
e match {
case l: LocalVar =>
val sigil = if localSigils then Sigil.BASIR.localVar else ""
BST(s"var $sigil${e.name}: ${vtype(e.getType)}")
case l: Global => BST(s"${Sigil.BASIR.globalVar}${e.name}: ${vtype(e.getType)}")
BST(s"var $sigil${namefixed}: ${vtype(e.getType)}")
case l: Global => BST(s"${Sigil.BASIR.globalVar}${namefixed}: ${vtype(e.getType)}")
}
}

Expand Down
Loading