Working numeric support

Signed-off-by: worksofliam <mrliamallan@live.co.uk>

Author: worksofliam

src/language/sql/statement.ts

@@ -1,7 +1,7 @@
 import SQLTokeniser, { NameTypes } from "./tokens";
 import { CTEReference, CallableReference, ClauseType, ClauseTypeWord, IRange, ObjectRef, QualifiedObject, StatementType, StatementTypeWord, Token } from "./types";
 
-const tokenIs = (token: Token|undefined, type: string, value?: string) => {
+export const tokenIs = (token: Token|undefined, type: string, value?: string) => {
 	return (token && token.type === type && (value ? token.value?.toUpperCase() === value : true));
 }
 

src/language/sql/tests/statements.test.ts

@@ -1386,7 +1386,7 @@ parserScenarios(`PL body tests`, ({newDoc}) => {
 
     const parameterTokens = medianResultSetProc.getBlockAt(46);
     expect(parameterTokens.length).toBeGreaterThan(0);
-    expect(parameterTokens.map(t => t.type).join()).toBe([`parmType`, `word`, `word`, `openbracket`, `word`, `comma`, `word`, `closebracket`].join());
+    expect(parameterTokens.map(t => t.type).join()).toBe([`parmType`, `word`, `word`, `openbracket`, `number`, `comma`, `number`, `closebracket`].join());
 
     const numRecordsDeclare = statements[1];
     expect(numRecordsDeclare.type).toBe(StatementType.Declare);

src/language/sql/tokens.ts

@@ -26,6 +26,13 @@ interface TokenState {
 
 export default class SQLTokeniser {
   static matchers: Matcher[] = [
+    {
+      name: `IS_NUMBER`,
+      match: [
+        { type: `word`, match: (value: string) => {return !isNaN(Number(value)) && !isNaN(parseFloat(value)); }},
+      ],
+      becomes: `number`,
+    },
     {
       name: `PROCEDURE_PARM_TYPE`,
       match: [{ type: `word`, match: (value: string) => {return [`IN`, `OUT`, `INOUT`].includes(value.toUpperCase())}}],

src/views/results/binding.ts

@@ -2,6 +2,7 @@ import { TextEditor } from "vscode";
 import { getSqlDocument } from "../../language/providers/logic/parse";
 import { StatementGroup } from "../../language/sql/types";
 import { SqlParameter } from "./resultSetPanelProvider";
+import { tokenIs } from "../../language/sql/statement";
 
 export function getPriorBindableStatement(editor: TextEditor, offset: number): string|undefined {
   const sqlDocument = getSqlDocument(editor.document);
@@ -28,9 +29,19 @@ export function getPriorBindableStatement(editor: TextEditor, offset: number): s
 export function getLiteralsFromStatement(group: StatementGroup): SqlParameter[] {
   const literals: SqlParameter[] = [];
   for (const statement of group.statements) {
-    for (const token of statement.tokens) {
+    let tokens = statement.tokens;
+    for (let i = 0; i < tokens.length; i++) {
+      const token = tokens[i];
       if (token.type === `string`) {
         literals.push(token.value.substring(1, token.value.length - 1)); // Remove quotes
+      } else if (token.type === `number`) {
+        // Handle decimal numbers
+        if (tokenIs(tokens[i+1], `number`) && tokenIs(tokens[i+2], `number`)) {
+          literals.push(Number(`${token.value}.${tokens[i+2].value}`));
+          i += 2; // Skip the next two tokens as they are part of the decimal number
+        } else {
+          literals.push(Number(token.value));
+        }
       }
     }
   }