Skip to content

cleanup #111

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
nmcb merged 1 commit into from
May 9, 2026
Merged

cleanup #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/scala/splatter/stutter/parsing.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import scala.annotation.tailrec

object parsing:

case class P[+A](parse: String => Option[(A,String)]):
case class P[+A](parse: String => Option[(A, String)]):

def flatMap[B](f: A => P[B]): P[B] =
P(s =>
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/splatter/stutter/stutter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ case class ExtractableOp1(name: String) extends ExtractableOp[Expr](name):
case Lisp(Seq(Op, arg)) => arg
}

case class ExtractableOp2(name: String) extends ExtractableOp[(Expr,Expr)](name):
case class ExtractableOp2(name: String) extends ExtractableOp[(Expr, Expr)](name):
def extract: PartialFunction[Expr, (Expr, Expr)] = {
case Lisp(Seq(Op, a, b)) => (a, b)
}
Expand All @@ -58,26 +58,26 @@ val PrimitiveOps: Seq[Atom] =
Seq(AtomLit.Op, QuoteLit.Op, EqLit.Op, CarLit.Op, CdrLit.Op, ConsLit.Op, CondLit.Op)

// (lambda (p1 ... pn) e)
object Lambda extends ExtractableOp[(Seq[Expr],Expr)]("lambda"):
object Lambda extends ExtractableOp[(Seq[Expr], Expr)]("lambda"):
def extract: PartialFunction[Expr, (Seq[Expr], Expr)] = {
case Lisp(Seq(Op, Lisp(parms), expr)) => (parms, expr)
}

// (quote (lambda (p1 ... pn) e))
object QuotedLambda extends ExtractableOp[(Seq[Expr],Expr)]("quote"):
object QuotedLambda extends ExtractableOp[(Seq[Expr], Expr)]("quote"):
def extract: PartialFunction[Expr, (Seq[Expr], Expr)] = {
case Lisp(Seq(Op, Lambda(parms, expr))) => (parms, expr)
}

// ((lambda (p1 ... pn) e) a1 ... an)
object Function extends Extractable[(Seq[Expr],Expr,Seq[Expr])]:
object Function extends Extractable[(Seq[Expr], Expr, Seq[Expr])]:
def extract: PartialFunction[Expr, (Seq[Expr], Expr, Seq[Expr])] = {
case Lisp(Lambda(parms, expr) +: args) =>
(parms, expr, args)
}

// ((lambda (p1 ... pn) (f fa1 ... fan)) a1 ... an)
object QuotedFunction extends Extractable[(Seq[Expr],Atom,Seq[Expr],Seq[Expr])]:
object QuotedFunction extends Extractable[(Seq[Expr], Atom, Seq[Expr], Seq[Expr])]:
def extract: PartialFunction[Expr, (Seq[Expr], Atom, Seq[Expr], Seq[Expr])] = {
case Lisp(Lambda(parms, Lisp((op : Atom) +: fargs)) +: args)
if !PrimitiveOps.contains(op) && args.nonEmpty && QuotedLambda.is(args.head) =>
Expand Down
3 changes: 1 addition & 2 deletions src/test/scala/splatter/stutter/PrimitiveExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PrimitiveExpressions extends AnyFunSpec:
parseLisp("(cond (eq ('a 'b) 'first) (eq ('a 'a) ('second)))")
) foreach (
e => (
e match {
e match
case Lisp(Seq(AtomLit.Op, _)) => AtomLit.Op.value
case Lisp(Seq(QuoteLit.Op, _)) => QuoteLit.Op.value
case Lisp(Seq(EqLit.Op, _, _)) => EqLit.Op.value
Expand All @@ -29,7 +29,6 @@ class PrimitiveExpressions extends AnyFunSpec:
case Lisp(Seq(ConsLit.Op, _, _)) => ConsLit.Op.value
case Lisp(CondLit.Op +: _) => CondLit.Op.value
case _ => sys.error(s"unmatched test expression $e")
}
) should be (e.asInstanceOf[Lisp].subs.head.asInstanceOf[Atom].value)
)

Expand Down