Merge pull request #608 from sharkdp/add-cdot-operator

Add '\cdot' as additional multiplication operator
sharkdp · Oct 9, 2024 · 359e50a · 359e50a
2 parents a4eadb6 + fae47e8
commit 359e50a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/assets/numbat.sublime-syntax b/assets/numbat.sublime-syntax
@@ -19,7 +19,7 @@ contexts:
       scope: variable.other.nbt
     - match: '(@aliases|@metric_prefixes|@binary_prefixes|@name|@url)'
       scope: meta.annotation.attribute.nbt
-    - match: '[+\-/*=\^:<>·×÷²³]'
+    - match: '[+\-/*=\^:<>·⋅×÷²³]'
       scope: keyword.operator.nbt
     - match: '[\(\)]'
       scope: punctuation.definition.parenthesis.nbt

diff --git a/assets/numbat.vim b/assets/numbat.vim
@@ -29,7 +29,7 @@ syn match numbatNumber '\v<([0-9]*\.[0-9]*|[0-9]*\.[0-9]+)([eE][+-]?[0-9]+)?>'
 highlight default link numbatNumber Number
 
 " Operators
-syn match numbatOperators "->\|[+*^=/\-:·×÷²³<>]"
+syn match numbatOperators "->\|[+*^=/\-:·⋅×÷²³<>]"
 highlight default link numbatOperators Operator
 
 " Unit decorators

diff --git a/book/src/example-numbat_syntax.md b/book/src/example-numbat_syntax.md
@@ -38,7 +38,7 @@ inf         # Infinity
 3 + (4 - 3)       # Addition and subtraction
 
 1920 / 16 * 9     # Multiplication, division
-1920 ÷ 16 × 9     # Unicode-style, '·' is also multiplication
+1920 ÷ 16 × 9     # Unicode-style, '·' or '⋅' works as well
 2 pi              # Whitespace is implicit multiplication
 meter per second  # 'per' keyword can be used for division
 

diff --git a/examples/numbat_syntax.nbt b/examples/numbat_syntax.nbt
@@ -33,7 +33,7 @@ inf         # Infinity
 3 + (4 - 3)       # Addition and subtraction
 
 1920 / 16 * 9     # Multiplication, division
-1920 ÷ 16 × 9     # Unicode-style, '·' is also multiplication
+1920 ÷ 16 × 9     # Unicode-style, '·' or '⋅' works as well
 2 pi              # Whitespace is implicit multiplication
 meter per second  # 'per' keyword can be used for division
 

diff --git a/numbat/src/parser.rs b/numbat/src/parser.rs
@@ -57,7 +57,7 @@
 //! boolean         ::=   "true" | "false"
 //! plus            ::=   "+"
 //! minus           ::=   "-"
-//! multiply        ::=   "*" | "×" | "·"
+//! multiply        ::=   "*" | "×" | "·" | "⋅"
 //! divide          ::=   "/" | "÷"
 //! string          ::=   '"' [^"]* '"'
 //! ```
@@ -2331,7 +2331,7 @@ mod tests {
     #[test]
     fn multiplication_and_division() {
         parse_as_expression(
-            &["1*2", "  1   *  2    ", "1 · 2", "1 × 2"],
+            &["1*2", "  1   *  2    ", "1 · 2", "1 ⋅ 2", "1 × 2"],
             binop!(scalar!(1.0), Mul, scalar!(2.0)),
         );
 

diff --git a/numbat/src/tokenizer.rs b/numbat/src/tokenizer.rs
@@ -211,6 +211,7 @@ fn is_identifier_continue(c: char) -> bool {
         || is_other_allowed_identifier_char(c))
         && !is_exponent_char(c)
         && c != '·'
+        && c != '⋅'
 }
 
 /// When scanning a string interpolation like `"foo = {foo}, and bar = {bar}."`,
@@ -555,7 +556,7 @@ impl Tokenizer {
             '|' if self.match_char(input, '>') => TokenKind::PostfixApply,
             '*' if self.match_char(input, '*') => TokenKind::Power,
             '+' => TokenKind::Plus,
-            '*' | '·' | '×' => TokenKind::Multiply,
+            '*' | '·' | '⋅' | '×' => TokenKind::Multiply,
             '/' => TokenKind::Divide,
             '÷' => TokenKind::Divide,
             '^' => TokenKind::Power,