Switch technical words to Am. English

Freedom rahh 🦅 🦅

Author: raikasdev

README.md

@@ -20,7 +20,7 @@ Kalkki is a modern web-based scientific calculator designed as an replacement fo
 - History (up and down arrow)
 - Progressive Web App for offline usage
 - Super fast math evaluation powered by [GMP and WASM](https://github.com/Daninet/gmp-wasm)
-- Tokeniser based math parser (forked from Abicus)
+- Tokenizer based math parser (forked from Abicus)
 
 ## Usage
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "kalkki",
 	"private": true,
-	"version": "0.2.4",
+	"version": "0.2.5-nightly",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

src/math/index.ts

@@ -8,10 +8,10 @@ import evaluate, {
 	type EvalValue,
 	type UserObject,
 } from "./internal/evaluator";
-import tokenise, { type LexicalError } from "./internal/tokeniser";
+import tokenize, { type LexicalError } from "./internal/tokenizer";
 
-export type { Token, TokenId } from "./internal/tokeniser";
-export { tokenise, evaluate };
+export type { Token, TokenId } from "./internal/tokenizer";
+export { tokenize, evaluate };
 
 export type AngleUnit = "deg" | "rad";
 
@@ -25,7 +25,7 @@ export function calculate(
 ): Result<EvalValue, EvaluationError | LexicalError> {
 	// This could be a one-liner with neverthrow's `andThen` but we want to
 	// jump out of neverthrow-land for React anyhow soon
-	const tokens = tokenise(expression);
+	const tokens = tokenize(expression);
 	if (tokens.isErr()) return err(tokens.error);
 	try {
 		let cacheKey = `${angleUnit}:${JSON.stringify(userSpace)}:${expression}`;

src/math/internal/evaluator.ts

@@ -7,7 +7,7 @@ import { P, type Pattern, isMatching, match } from "ts-pattern";
 
 import type { AngleUnit } from "..";
 import { factorial, functions } from "./functions";
-import type { Token } from "./tokeniser";
+import type { Token } from "./tokenizer";
 
 export type EvalResult = Result<LargeNumber, EvaluationError>;
 export type EvalValue = {

src/math/internal/tokeniser.ts src/math/internal/tokenizer.tssrc/math/internal/tokeniser.ts renamed to src/math/internal/tokenizer.ts

@@ -4,7 +4,7 @@ import { match } from "ts-pattern";
 import type { functions } from "./functions";
 
 /**
- * Represents an error where the tokeniser couldn't match the input to any token.
+ * Represents an error where the tokenizer couldn't match the input to any token.
  * The `idx` field points to the start of the unknown part in the input.
  */
 export type LexicalError = { type: "UNKNOWN_TOKEN"; idx: number };
@@ -124,17 +124,17 @@ const tokenMatchers = [
 
 /**
  * Reads an input expression and returns a `Result<Token[], LexicalError>` where
- * - `Token[]` is the tokenised expression, or
+ * - `Token[]` is the tokenized expression, or
  * - `LexicalError.idx` is the starting index of the *first lexical error* (i.e. unrecognised word) in the input expression.
  *
  * @see {@link Token}
  * @example
  * ```typescript
- * tokenise("1 + 2") // => Ok([{ type: "litr", value: Decimal(1) }, { type: "oper", name: "+" }, ...])
- * tokenise("1 ö 2") // => Err({ type: "UNKNOWN_TOKEN", idx: 2 }) // 2 === "1 ö 2".indexOf("ö")
+ * tokenize("1 + 2") // => Ok([{ type: "litr", value: Decimal(1) }, { type: "oper", name: "+" }, ...])
+ * tokenize("1 ö 2") // => Err({ type: "UNKNOWN_TOKEN", idx: 2 }) // 2 === "1 ö 2".indexOf("ö")
  * ```
  */
-export default function tokenise(
+export default function tokenize(
 	expression: string,
 ): Result<Token[], LexicalError> {
 	return Result.combine([...tokens(expression)]);
@@ -149,7 +149,7 @@ export default function tokenise(
  * The generator stops on the first lexical error.
  * I.e. if an error is encountered, it will be the last value output by the generator.
  *
- * @see {@link tokenise}
+ * @see {@link tokenize}
  * @see {@link Token}
  */
 function* tokens(

src/math/prettify.ts

@@ -1,5 +1,5 @@
 import { P, match } from "ts-pattern";
-import { type Token, tokenise } from ".";
+import { type Token, tokenize } from ".";
 
 /**
  * Takes in an unformatted expression (e.g. `1+2*(cos(2)/sqrt(pi))`) and gives out a "prettified"
@@ -10,7 +10,7 @@ import { type Token, tokenise } from ".";
 export default function prettify(expression: string | Token[]) {
 	let tokens: Token[];
 	if (typeof expression === "string") {
-		const result = tokenise(expression);
+		const result = tokenize(expression);
 		if (result.isErr()) return expression;
 
 		tokens = result.value;

src/math/syntax-highlighter.tsx

@@ -1,4 +1,4 @@
-import type { LexicalError } from "@/math/internal/tokeniser";
+import type { LexicalError } from "@/math/internal/tokenizer";
 import { Result, err, ok } from "neverthrow";
 
 type TokenMatcher = (typeof tokenMatchers)[number];

src/util/index.ts

@@ -1,7 +1,7 @@
 import { type Language, translate } from "@/lang";
 import { LargeNumber } from "@/math/internal/large-number";
 import type { EvaluationError, UserObject } from "../math/internal/evaluator";
-import type { LexicalError } from "../math/internal/tokeniser";
+import type { LexicalError } from "../math/internal/tokenizer";
 
 export type MathError = EvaluationError | LexicalError;
 export function parseError(error: MathError, lang: Language) {