From 252ed1c9253866e1560228257b2fa99c20e52501 Mon Sep 17 00:00:00 2001 From: Gleb Koval Date: Mon, 27 Jan 2025 14:47:57 +0000 Subject: [PATCH] refactor: use scalafmt to format code --- .editorconfig | 12 ++++++++++++ .scalafmt.conf | 2 ++ src/main/wacc/Main.scala | 17 +++++++++-------- src/main/wacc/lexer.scala | 14 +++++++------- src/main/wacc/parser.scala | 18 +++++++++--------- 5 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 .editorconfig create mode 100644 .scalafmt.conf diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f0e0cf3 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true + +[Makefile] +indent_style = tab +indent_size = 4 + diff --git a/.scalafmt.conf b/.scalafmt.conf new file mode 100644 index 0000000..4d4a975 --- /dev/null +++ b/.scalafmt.conf @@ -0,0 +1,2 @@ +version = 3.8.6 +runner.dialect = scala36 diff --git a/src/main/wacc/Main.scala b/src/main/wacc/Main.scala index 898b5f8..a4c9fd7 100644 --- a/src/main/wacc/Main.scala +++ b/src/main/wacc/Main.scala @@ -3,13 +3,14 @@ package wacc import parsley.{Success, Failure} def main(args: Array[String]): Unit = { - println("hello WACC!") + println("hello WACC!") - args.headOption match { - case Some(expr) => parser.parse(expr) match { - case Success(x) => println(s"$expr = $x") - case Failure(msg) => println(msg) - } - case None => println("please enter an expression") - } + args.headOption match { + case Some(expr) => + parser.parse(expr) match { + case Success(x) => println(s"$expr = $x") + case Failure(msg) => println(msg) + } + case None => println("please enter an expression") + } } diff --git a/src/main/wacc/lexer.scala b/src/main/wacc/lexer.scala index 7a1872f..f633bf6 100644 --- a/src/main/wacc/lexer.scala +++ b/src/main/wacc/lexer.scala @@ -5,12 +5,12 @@ import parsley.token.Lexer import parsley.token.descriptions.* object lexer { - private val desc = LexicalDesc.plain.copy( - // your configuration goes here - ) - private val lexer = Lexer(desc) + private val desc = LexicalDesc.plain.copy( + // your configuration goes here + ) + private val lexer = Lexer(desc) - val integer = lexer.lexeme.integer.decimal - val implicits = lexer.lexeme.symbol.implicits - def fully[A](p: Parsley[A]): Parsley[A] = lexer.fully(p) + val integer = lexer.lexeme.integer.decimal + val implicits = lexer.lexeme.symbol.implicits + def fully[A](p: Parsley[A]): Parsley[A] = lexer.fully(p) } diff --git a/src/main/wacc/parser.scala b/src/main/wacc/parser.scala index 083a8d0..370f8aa 100644 --- a/src/main/wacc/parser.scala +++ b/src/main/wacc/parser.scala @@ -7,14 +7,14 @@ import lexer.implicits.implicitSymbol import lexer.{integer, fully} object parser { - def parse(input: String): Result[String, BigInt] = parser.parse(input) - private val parser = fully(expr) - - private val add = (x: BigInt, y: BigInt) => x + y - private val sub = (x: BigInt, y: BigInt) => x - y + def parse(input: String): Result[String, BigInt] = parser.parse(input) + private val parser = fully(expr) - private lazy val expr: Parsley[BigInt] = - chain.left1(integer | "(" ~> expr <~ ")")( - ("+" as add) | ("-" as sub) - ) + private val add = (x: BigInt, y: BigInt) => x + y + private val sub = (x: BigInt, y: BigInt) => x - y + + private lazy val expr: Parsley[BigInt] = + chain.left1(integer | "(" ~> expr <~ ")")( + ("+" as add) | ("-" as sub) + ) }