LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml

@@ -504,7 +504,7 @@ Item {
         Generates a list of tokens from the given.
     */
     function tokens(text) {
-        let tokenizer = new Parsing.Tokenizer(new Parsing.Input(text), true, true, false)
+        let tokenizer = new Parsing.Tokenizer(new Parsing.Input(text), true, false)
         let tokenList = []
         let token
         while((token = tokenizer.next()) != null)

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/latex.js

@@ -103,7 +103,7 @@ function functionToLatex(f, args) {
  * @param {string} vari - variable to convert
  * @returns {string}
  */
-
+function variable(vari) {
     let unicodechars = ["α","β","γ","δ","ε","ζ","η",
                         "π","θ","κ","λ","μ","ξ","ρ",
                         "ς","σ","τ","φ","χ","ψ","ω",
@@ -124,7 +124,6 @@ let equivalchars = ["\\alpha","\\beta","\\gamma","\\delta","\\epsilon","\\zeta",
                         "{}^{7}","{}^{8}","{}^{9}","{}^{0}","{}_{1}","{}_{2}","{}_{3}",
                         "{}_{4}","{}_{5}","{}_{6}","{}_{7}","{}_{8}","{}_{9}","{}_{0}",
                         "\\pi"]
-function variable(vari) {
     for(let i = 0; i < unicodechars.length; i++) {
         //console.log(vari, unicodechars[i], equivalchars[i]);
         if(vari.includes(unicodechars[i]))

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/builder.js

@@ -23,217 +23,25 @@
 
 
 class ExpressionBuilder {
-    constructor(tokenizer, rememberTokens = false) {
+    constructor(tokenizer) {
         this.tokenizer = tokenizer;
-        if(tokenizer.tokenizeWhitespaces) {
-            console.warn('WARNING: The ExpressionTokenizer for ExpressionBuilder was initialized with whitespace support. Disabled.')
-            tokenizer.tokenizeWhitespaces = false
-        }
-        if(tokenizer.differentiateIdentifiers) {
-            console.warn('WARNING: The ExpressionTokenizer for ExpressionBuilder was initialized with identifier differentiation support. Disabled.')
-            tokenizer.differentiateIdentifiers = false
-        }
-        this.tokens = []
-        this.rememberTokens = rememberTokens
-        this.stack = []
     }
     
-    /**
+    parseExpression(delimitors = '') {
-     * Parses an expression until the end is reached.
-     * 
-     * @throws {Error} When an unexpected token is encountered.
-     * @returns {AbstractSyntaxElement}
-     */
-    parseFullExpression() {
-        this.parseExpression([])
-        return this.stack.pop()
-    }
-    
-    /**
-     * Parses an expression until the end is reached.
-     * 
-     * @param {string} punctuationDelimitators - List of deliminators that ends the expression
-     * @throws {Error} When an unexpected token is encountered.
-     */
-    parseExpression(punctuationDelimitators = []) {
-        let token
-        while((token = this.tokenizer.peek()) != null) {
-            if(token.type == TK.TokenType.PUNCT && token.value != '(') // Still allow expression creation.
-                if(punctuationDelimitators.includes(token.value))
-                    break
-                else if(punctuationDelimitators.length == 1)
-                    this.tokenizer.raise(`Unexpected ${token.value}. Expected '${punctuationDelimitators[0]}'.`)
-                else
-                    this.tokenizer.raise(`Unexpected ${token.value}. Expected one of: '${punctuationDelimitators[0].join("', '")}'.`)
-            else
-                this.handleSingle()
-        }
-        
-        if(token == null && punctuationDelimitators.length > 0)
-            if(punctuationDelimitators.length == 1)
-                this.tokenizer.raise(`Unexpected end of expression. Expected '${punctuationDelimitators[0]}'.`)
-            else
-                this.tokenizer.raise(`Unexpected end of expression. Expected one of: '${punctuationDelimitators[0].join("', '")}'.`)
-        
-                
-        if(this.stack.length == 0)
-            if(token == null)
-                this.tokenizer.raise(`Unexpected end of expression. Expected at least one element.`)
-            else
-                this.tokenizer.raise(`Unexpected ${token.value}. Expected at least one element.`)
-            
-        if(this.stack.length > 1)
-            this.tokenizer.raise('Invalid expression.')
-    }
-    
-    /**
-     * Handles a single (assumed non-null) token based on its type.
-     * 
-     * @param {AbstractSyntaxElement} token
-     * @throws {Error} When an unexpected token is encountered.
-     */
-    handleSingle(token) {
-        switch(token.type) {
-            case TK.TokenType.IDENTIFIER:
-                this.parseIdentifier()
-                break
-            case TK.TokenType.OPERATOR:
-                if(this.stack.length == 0 && Reference.UNARY_OPERATORS.includes(token.value))
-                    this.parseSingleOperation()
-                else if(this.stack.length > 0 && Reference.BINARY_OPERATORS.includes(token.value))
-                    this.parseBinaryOperations()
-                else if(this.stack.length > 0 && Reference.TERTIARY_OPERATORS.includes(token.value))
-                    this.parseTertiaryOperation()
-                break
-            case TK.TokenType.NUMBER:
-                this.stack.push(new AST.NumberElement(this.tokenizer.next().value))
-                break
-            case TK.TokenType.STRING:
-                this.stack.push(new AST.StringElement(this.tokenizer.next().value))
-                break
-            case TK.TokenType.PUNCT:
-                if(token.value == '(') {
-                    this.tokenizer.skip(TK.TokenType.PUNCT, '(') // Skip the opening parentheses.
-                    this.parseExpression([')'])
-                } else
-                    this.tokenizer.raise(`Unexpected ${token.value}. Expected a value.`)
-                break
-            default:
-                this.tokenizer.raise(`Unknown token provided: ${token.value}.`)
-                break
-        }
-        if(this.rememberTokens)
-            this.tokens.push(token)
-    }
-    
-    /**
-     * Parses a single token element.
-     * 
-     * @throws {Error} When an unexpected token is encountered.
-     */
-    parseSingle() {
-        let token = this.tokenizer.peek()
-        if(token != null)
-            this.handleSingle(token)
-    }
-    
-    parseIdentifier() {
-        // Assuming the right type.
-        let token = this.tokenizer.read(TK.TokenType.IDENTIFIER)
-        if(Reference.CONSTANTS_LIST.includes(token.value))
-            this.stack.push(new AST.Constant(token.value))
-        else
-            this.stack.push(new AST.Variable(token.value))
-        this.checkIdentifierFollowupTokens()
-    }
-    
-    /**
-     * Parses a function based on a previously called identifier.
-     * NOTE: Expects to have at least one stack element for function name.
-     */
-    parseFunction() {
-        // TODO: Implement dynamic functions values instead of being based on names.
-        let functionValue = this.stack.pop()
-        if(!(functionValue instanceof AST.Variable))
-            this.tokenizer.raise("Executing functions from dynamic variables is not implemented".)
-        let functionName = functionValue.variableName
-        let args = []
-        let token
-        while((token = this.tokenizer.peek()) != null && token.value != ')') {
-            this.tokenizer.skip(TK.TokenType.PUNCT) // Skip the opening parenthesis and the commas.
-            parseExpression([',',')'])
-            args.push(this.stack.pop())
-        }
-            
-        if(token == null)
-            this.tokenizer.raise(`Unexpected end of expression. Expected ')'.`)
-        
-        if(this.functionName == 'derivation')
-            this.stack.push(new AST.DerivationElement(args))
-        else if(this.functionName == 'integral')
-            this.stack.push(new AST.IntegralElement(args))
-        else
-            this.stack.push(new AST.FunctionElement(functionName, args))
-    }
-    
-    
-    /**
-     * Parses an object property based on a previously called identifier.
-     * NOTE: Expects to have at least one stack element for property object name.
-     */
-    parseProperty() {
-        this.tokenizer.skip(TK.TokenType.PUNCT, '.') // Skipping the dot.
-        let token = this.tokenizer.read(TK.TokenType.IDENTIFIER)
-        this.stack.push(new AST.PropertyElement(this.stack.pop(), token.value))
-        this.checkIdentifierFollowupTokens()
-    }
-    
-    /**
-     * Parses the value of the element of an array at a given index based on a previously called identifier.
-     * NOTE: Expects to have at least one stack element for property object name.
-     */
-    parseArrayValue() {
-        this.tokenizer.skip(TK.TokenType.PUNCT, '[') // Skipping the array opener.
-        let obj = this.stack.pop()
-        parseExpression([']'])
-        this.stack.push(new AST.ArrayElement(obj, this.stack.pop()))
-        this.checkIdentifierFollowupTokens()
-    }
-    
-    /**
-     * Checks for followup tokens following a value getting.
-     * E.g: getting the property of an object, an array member, or calling a function.
-     * NOTE: Expects to have at least one stack element for previous calling object.
-     */
-    checkIdentifierFollowupTokens() {
-        let peeked = this.tokenizer.peek()
-        if(peeked != null && peeked.type == TK.TokenType.PUNCT)
-            switch(peeked.value) {
-                case '(':
-                    // Function call
-                    this.parseFunction()
-                    break
-                case '.':
-                    // Member property
-                    this.parseProperty()
-                    break
-                case '[':
-                    // Array value
-                    this.parseArrayValue()
-                    break
-            }
-    }
-    
-    parseBinaryOperations() {
-        if((this.tokenizer.peek().value in AST.BINARY_OPERATION_PRIORITY))
-            throw new Error("Current token is not a binary operator.")
-        if(this.stack.length == 0)
-            throw new Error(`The operator ${this.tokenizer.peek().value} can only be used after a value.`)
         // Parse a sequence of operations, and orders them based on OPERATION_PRIORITY.
-        let elements = [this.stack.pop()]
+        let elements = []
-        let operators = [this.tokenizer.next()]
+        let operators = []
-        let token
+        let firstToken = this.tokenizer.peek();
-        while((token = this.tokenizer.peek()) != null) {
+        if(firstToken.type == TK.TokenType.OPERATOR) // First operations.
+            if(firstToken.value == "-") {
+                // TODO: Set initial argument.
+                this.tokenizer.skip(TK.TokenType.OPERATOR)
+            } else
+                tokenizer.input.raise(`Invalid operator ${firstToken.value} at begining of statement.`)
+        else {
+            
         }
     }
+    
+    parseOperation()`
 }

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/reference.js

@@ -28,21 +28,6 @@ const CONSTANTS = {
 };
 const CONSTANTS_LIST = Object.keys(CONSTANTS);
 
-const UNARY_OPERATORS = []
-
-const BINARY_OPERATION_PRIORITY = {
-    'and': 0, 'or': 0, 'in': 0,
-    '==': 10, '!=' : 10,
-    '>': 10, '<': 10, '>=': 10, '<=': 10,
-    '%': 20, '||': 20,
-    '+': 30, '-': 30,
-    '*': 40, '/': 40,
-    '^': 50
-}
-const BINARY_OPERATORS = Object.keys(BINARY_OPERATION_PRIORITY)
-
-const TERTIARY_OPERATORS = ['?']
-
 const FUNCTIONS = {
     "abs": Math.abs,
     "acos": Math.acos,
@@ -86,15 +71,15 @@ const FUNCTIONS_LIST = Object.keys(FUNCTIONS);
 // TODO: Complete
 const DERIVATIVES = {
     "abs": "abs(<1>)/<1>",
-    "acos": "-derivative(<1>)/sqrt(1-(<1>)^2)",
+    "acos": "-derivate(<1>)/sqrt(1-(<1>)^2)",
-    "acosh": "derivative(<1>)/sqrt((<1>)^2-1)",
+    "acosh": "derivate(<1>)/sqrt((<1>)^2-1)",
-    "asin": "derivative(<1>)/sqrt(1-(<1>)^2)",
+    "asin": "derivate(<1>)/sqrt(1-(<1>)^2)",
-    "asinh": "derivative(<1>)/sqrt((<1>)^2+1)",
+    "asinh": "derivate(<1>)/sqrt((<1>)^2+1)",
-    "atan": "derivative(<1>)/(1+(<1>)^2)",
+    "atan": "derivate(<1>)/(1+(<1>)^2)",
     "atan2": "",
 }
 const INTEGRALS = {
-    "abs": "integral(<1>)*sign(<1>)",
+    "abs": "integrate(<1>)*sign(<1>)",
     "acos": "",
     "acosh": "",
     "asin": "",

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/tokenizer.js

@@ -23,14 +23,13 @@
 const WHITESPACES = " \t\n\r"
 const STRING_LIMITORS = '"\'`';
 const OPERATORS = "+-*/^%?:=!><";
-const PUNCTUTATION = "()[],.";
+const PUNCTUTATION = "()[]{},.";
 const NUMBER_CHARS = "0123456789"
 const IDENTIFIER_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789_₀₁₂₃₄₅₆₇₈₉αβγδεζηθκλμξρςστφχψωₐₑₒₓₔₕₖₗₘₙₚₛₜ"
 
 var TokenType = {
     // Expression type
     "WHITESPACE": "WHITESPACE",
-    "IDENTIFIER": "IDENTIFIER",
     "VARIABLE": "VARIABLE",
     "CONSTANT": "CONSTANT",
     "FUNCTION": "FUNCTION",
@@ -50,11 +49,10 @@ class Token {
 }
 
 class ExpressionTokenizer {
-    constructor(input, tokenizeWhitespaces = false, differentiateIdentifiers = false, errorOnUnknown = true) {
+    constructor(input, tokenizeWhitespaces = false, errorOnUnknown = true) {
-        this.input = input
+        this.input = input;
-        this.currentToken = null
+        this.currentToken = null;
         this.tokenizeWhitespaces = tokenizeWhitespaces
-        this.differentiateIdentifiers = differentiateIdentifiers
         this.errorOnUnknown = errorOnUnknown
     }
     
@@ -117,16 +115,10 @@ class ExpressionTokenizer {
         while(!this.input.atEnd() && IDENTIFIER_CHARS.includes(this.input.peek().toLowerCase())) {
             identifier += this.input.next();
         }
-        let identifierLC = identifier.toLowerCase()
+        if(Reference.CONSTANTS_LIST.includes(identifier.toLowerCase())) {
-        if(Reference.CONSTANTS_LIST.includes(identifierLC)) {
+            return new Token(TokenType.CONSTANT, identifier.toLowerCase(), this.input.position-identifier.length)
-            return new Token(TokenType.CONSTANT, identifierLC, this.input.position-identifier.length)
+        } else if(Reference.FUNCTIONS_LIST.includes(identifier.toLowerCase())) {
-        } else if(Reference.FUNCTIONS_LIST.includes(identifierLC)) {
+            return new Token(TokenType.FUNCTION, identifier.toLowerCase(), this.input.position-identifier.length)
-            return new Token(TokenType.FUNCTION, identifierLC, this.input.position-identifier.length)
-        } else if(Reference.UNARY_OPERATORS.includes(identifierLC) || 
-            Reference.BINARY_OPERATORS.includes(identifierLC) ||
-            Reference.TERTIARY_OPERATORS.includes(identifierLC)
-        ) {
-            return new Token(TokenType.OPERATOR, identifierLC, this.input.position-identifier.length)
         } else {
             return new Token(TokenType.VARIABLE, identifier, this.input.position-identifier.length)
         }
@@ -145,7 +137,7 @@ class ExpressionTokenizer {
         if(Reference.CONSTANTS_LIST.includes(c)) return new Token(TokenType.CONSTANT, this.input.next(), this.input.position-1);
         if(PUNCTUTATION.includes(c)) return new Token(TokenType.PUNCT, this.input.next(), this.input.position-1);
         if(this.errorOnUnknown)
-            this.raise("Unknown token character " + c)
+            this.input.throw("Unknown token character " + c)
         else
             return new Token(TokenType.UNKNOWN, this.input.next(), this.input.position-1);
     }
@@ -165,24 +157,13 @@ class ExpressionTokenizer {
         return tmp;
     }
     
-    read(type, value) {
-        let next = this.next()
-        if(type != null && next.type != type)
-            this.raise(`Unexpected ${next.type.toLowerCase()} ${next.value}. Expected type was ${type.toLowerCase()}.`);
-        if(value != null && next.value == value)
-            this.raise(`Unexpected ${next.type.toLowerCase()} ${next.value}. Expected value was ${value}.`);
-        return next
-    }
-    
     atEnd() {
         return this.peek() == null;
     }
     
-    skip(type, value) {
+    skip(type) {
-        this.read(type, value)
+        let next = this.next();
-    }
+        if(next.type != type)
-    
+            input.raise("Unexpected token " + next.type.toLowerCase() + ' "' + next.value + '". Expected ' + type.toLowerCase());
-    raise(message) {
-        this.input.raise(message)
     }
 }