Merge branch 'release/v1.1.0-stable'

docs/src/manual.tex

@@ -12,6 +12,9 @@
 \usepackage{amsmath}
 \usepackage{listings}
 \usepackage{keystroke}
+\usepackage{pagecolor}
+\usepackage{graphicx}
+\usepackage{geometry}
 
 % Defnitions
 \definecolor{MedB}{HTML}{0074f0}
@@ -23,7 +26,7 @@
 % Macros
 \newcommand{\MedleyB}[1]{{\textcolor{MedB}{#1}}}
 \newcommand{\MedleyLB}[1]{{\textcolor{MedLB}{#1}}}
-\newcommand{\medleyver}{1.1.0{-}beta2}
+\newcommand{\medleyver}{1.1.0{-}stable}
 
 % Settings
 \hypersetup{
@@ -47,14 +50,17 @@
 % Document
 \begin{document}
     \begin{titlepage}
-        \ttfamily{{\fontsize{35pt}{0pt}\selectfont
-        \MedleyB{>} \MedleyLB{Medley}\par\vspace{12pt}
-        \ \MedleyB{=} \MedleyLB{Calc With \LaTeX{} Syntax}
-        }}
+        \pagecolor{black}
+        \newgeometry{left=0mm, right=0mm}
+        \begin{figure}[h]
+            \centering
+            \includegraphics[scale=1.6]{../../images/repo-card}
+        \end{figure}
         \vfill
-        \centerline{\rmfamily{{\fontsize{25pt}{0pt}\selectfont
-        Manual for Version \medleyver}}}
+        \color{white}{\centerline{\rmfamily{\bfseries{\huge
+        Manual for Version \medleyver}}}}
     \end{titlepage}
+    \pagecolor{white}
     \title{{\Huge\bfseries{Medley}}\\
     \LaTeX{}の構文を用いたCLI電卓}
     \author{NXVZBGBFBEN\\

src/lexer.rs

@@ -38,7 +38,10 @@ impl Lexer {
                 self.next();
                 number.push(*self.curr().unwrap());
             }
-            Ok(String::from_iter(number).parse::<f64>().ok().map(Token::Number))
+            Ok(String::from_iter(number)
+                .parse::<f64>()
+                .ok()
+                .map(Token::Number))
         } else if self.curr() == Some(&'\\') {
             //コマンドを読み込んだ場合
             let mut command = vec![*self.curr().unwrap()];
@@ -80,4 +83,4 @@ impl Lexer {
     fn is_number(c: &char) -> bool {
         c.is_ascii_digit() || c == &'.'
     }
-}
+}

src/lib.rs

@@ -1,2 +1,2 @@
 pub mod lexer;
-pub mod parser;
+pub mod parser;

src/main.rs

@@ -1,11 +1,11 @@
+use medley::lexer;
+use medley::parser;
 use std::borrow::Borrow;
 use std::io;
 use std::io::Write;
-use medley::lexer;
-use medley::parser;
 
 fn main() {
-    println!("This is Medley, Version 1.1.0-beta2 (2023-03-02)");
+    println!("This is Medley, Version 1.1.0-stable (2023-04-01)");
     loop {
         print!("> ");
         io::stdout().flush().unwrap();
@@ -22,11 +22,11 @@ fn main() {
                         if let Some(expr) = parser.parse() {
                             match eval(expr.borrow()) {
                                 Ok(result) => println!(" = {result}"),
-                                Err(calc_err) => println!(" = [CALC_ERR] {calc_err}")
+                                Err(calc_err) => println!(" = [CALC_ERR] {calc_err}"),
                             }
                         }
                     }
-                    Err(syntax_err) => println!(" = [SYNTAX_ERR] {syntax_err}")
+                    Err(syntax_err) => println!(" = [SYNTAX_ERR] {syntax_err}"),
                 }
             }
             Err(input_err) => {
@@ -52,14 +52,16 @@ fn eval(expr: &parser::Expr) -> Result<f64, String> {
                 "Plus" => Ok(left + right),
                 "Minus" => Ok(left - right),
                 "Times" => Ok(left * right),
-                "Div" => if left == 0 as f64 && right == 0 as f64 {
-                    Err(String::from("indeterminate (divided by 0)"))
-                } else if right == 0 as f64 {
-                    Err(String::from("incompatible (divided by 0)"))
-                } else {
-                    Ok(left / right)
+                "Div" => {
+                    if left == 0 as f64 && right == 0 as f64 {
+                        Err(String::from("indeterminate (divided by 0)"))
+                    } else if right == 0 as f64 {
+                        Err(String::from("incompatible (divided by 0)"))
+                    } else {
+                        Ok(left / right)
+                    }
                 }
-                _ => Err(String::from("invalid operator"))
+                _ => Err(String::from("invalid operator")),
             }
         }
         parser::Expr::Fraction {
@@ -77,4 +79,4 @@ fn eval(expr: &parser::Expr) -> Result<f64, String> {
             }
         }
     }
-}
+}

src/parser.rs

@@ -1,5 +1,5 @@
-use std::mem;
 use crate::lexer;
+use std::mem;
 
 /*構文木の定義*/
 pub enum Expr {
@@ -164,16 +164,14 @@ impl Parser {
     fn peek_precedence(&mut self) -> Precedence {
         return match self.peek() {
             Some(x) => Self::token_precedence(x.as_ref().unwrap()),
-            None => Precedence::Lowest
+            None => Precedence::Lowest,
         };
     }
     //次のトークンが引数として与えられたトークンかどうか判別する
     fn discriminant(&mut self, token: &lexer::Token) -> bool {
         match self.peek() {
-            Some(x) => {
-                mem::discriminant(x.as_ref().unwrap()) == mem::discriminant(token)
-            }
-            None => false
+            Some(x) => mem::discriminant(x.as_ref().unwrap()) == mem::discriminant(token),
+            None => false,
         }
     }
     fn next(&mut self) {
@@ -185,4 +183,4 @@ impl Parser {
     fn peek(&mut self) -> Option<&Option<lexer::Token>> {
         self.token.get(self.position + 1)
     }
-}
+}