functions: rnd, atn and sqr added

Author: iSorp

server/src/macroLanguageService/languageFacts/builtinData.ts

@@ -135,7 +135,7 @@ export const functionSignatures: { [name: string]: FunctionSignature[] } = {
 			param: [ { _bracket: '[' }, { _param: [ { value1: 'value1'} ] }, { _bracket: ']' }, { _escape: '/' }, { _bracket: '[' }, { _param: [ { value2: 'value2'} ] }, { _bracket: ']' } ]
 		},
 		{ 
-			description: 'Arc tangent (one parameter), ATN can also be used.',
+			description: 'Arc tangent (one parameter), ATN can also be used',
 			param: [ { _bracket: '[' }, { _param: [ { value: 'value'} ] }, { _bracket: ']' } ]
 		},
 		{ 
@@ -144,12 +144,33 @@ export const functionSignatures: { [name: string]: FunctionSignature[] } = {
 			param: [ { _bracket: '[' }, { _param: [ { value1: 'value1' } , { value2: 'value2'} ] }, { _bracket: ']' } ]
 		}
 	],
+	'atn': [
+		{ 
+			description: 'Arc tangent (two parameters)',
+			param: [ { _bracket: '[' }, { _param: [ { value1: 'value1'} ] }, { _bracket: ']' }, { _escape: '/' }, { _bracket: '[' }, { _param: [ { value2: 'value2'} ] }, { _bracket: ']' } ]
+		},
+		{ 
+			description: 'Arc tangent (one parameter)',
+			param: [ { _bracket: '[' }, { _param: [ { value: 'value'} ] }, { _bracket: ']' } ]
+		},
+		{ 
+			description: 'Arc tangent (two parameters)',
+			delimiter: ',', 
+			param: [ { _bracket: '[' }, { _param: [ { value1: 'value1' } , { value2: 'value2'} ] }, { _bracket: ']' } ]
+		}
+	],
 	'sqrt': [	
 		{ 
 			description: 'Square root, SQR can also be used',
 			param: [ { _bracket: '[' }, { _param: [ { value: 'value' } ] }, { _bracket: ']' } ]
 		}
 	],
+	'sqr': [	
+		{ 
+			description: 'Square root',
+			param: [ { _bracket: '[' }, { _param: [ { value: 'value' } ] }, { _bracket: ']' } ]
+		}
+	],
 	'abs': [	
 		{ 
 			description: 'Absolute value',
@@ -174,6 +195,12 @@ export const functionSignatures: { [name: string]: FunctionSignature[] } = {
 			param: [ { _bracket: '[' }, { _param: [ { value: 'value' } ] }, { _bracket: ']' } ]
 		}
 	],
+	'rnd': [	
+		{ 
+			description: 'Rounding off',
+			param: [ { _bracket: '[' }, { _param: [ { value: 'value' } ] }, { _bracket: ']' } ]
+		}
+	],
 	'fix': [	
 		{ 
 			description: 'Rounding down to an integer',

server/src/macroLanguageService/parser/macroScanner.ts

@@ -217,11 +217,14 @@ staticFunctionTable['tan'] = TokenType.Ffunc;
 staticFunctionTable['asin'] = TokenType.Ffunc;
 staticFunctionTable['acos'] = TokenType.Ffunc;
 staticFunctionTable['atan'] = TokenType.Ffunc;
+staticFunctionTable['atn'] = TokenType.Ffunc;
 staticFunctionTable['sqrt'] = TokenType.Ffunc;
+staticFunctionTable['sqr'] = TokenType.Ffunc;
 staticFunctionTable['abs'] = TokenType.Ffunc;
 staticFunctionTable['bin'] = TokenType.Ffunc;
 staticFunctionTable['bcd'] = TokenType.Ffunc;
 staticFunctionTable['round'] = TokenType.Ffunc;
+staticFunctionTable['rnd'] = TokenType.Ffunc;
 staticFunctionTable['fix'] = TokenType.Ffunc;
 staticFunctionTable['fup'] = TokenType.Ffunc;
 staticFunctionTable['ln'] = TokenType.Ffunc;

snippets/snippets.json

@@ -152,19 +152,37 @@
 	"atan": {
 		"prefix": "atan",
 		"body": "ATAN[${1:value}]",
-		"description": "Arc tangent (one parameter), ATN can also be used.",
+		"description": "Arc tangent (one parameter), ATN can also be used",
 		"scope": "source.macro"
 	},
 	"atan2": {
 		"prefix": "atan",
 		"body": "ATAN[${1:value1}]/[${2:value2}]",
-		"description": "Arc tangent (two parameters), ATN can also be used.",
+		"description": "Arc tangent (two parameters), ATN can also be used",
 		"scope": "source.macro"
 	},
 	"atan3": {
 		"prefix": "atan",
 		"body": "ATAN[${1:name1},${2:name2}]",
-		"description": "Arc tangent (two parameters), ATN can also be used.",
+		"description": "Arc tangent (two parameters), ATN can also be used",
+		"scope": "source.macro"
+	},
+	"atn": {
+		"prefix": "atn",
+		"body": "ATN[${1:value}]",
+		"description": "Arc tangent (one parameter)",
+		"scope": "source.macro"
+	},
+	"atn2": {
+		"prefix": "atn",
+		"body": "ATN[${1:value1}]/[${2:value2}]",
+		"description": "Arc tangent (two parameters)",
+		"scope": "source.macro"
+	},
+	"atn3": {
+		"prefix": "atn",
+		"body": "ATN[${1:name1},${2:name2}]",
+		"description": "Arc tangent (two parameters)",
 		"scope": "source.macro"
 	},
 	"sqrt": {
@@ -173,6 +191,12 @@
 		"description": "Square root, SQR can also be used.",
 		"scope": "source.macro"
 	},
+	"sqr": {
+		"prefix": "sqr",
+		"body": "SQR[${1:value}]",
+		"description": "Square root",
+		"scope": "source.macro"
+	},
 	"abs": {
 		"prefix": "abs",
 		"body": "ABS[${1:value}]",
@@ -197,6 +221,12 @@
 		"description": "Rounding off, RND can also be used",
 		"scope": "source.macro"
 	},
+	"rnd": {
+		"prefix": "rnd",
+		"body": "RND[${1:value}]",
+		"description": "Rounding off",
+		"scope": "source.macro"
+	},
 	"fix": {
 		"prefix": "fix",
 		"body": "FIX[${1:value}]",

syntaxes/macro.tmLanguage.json

@@ -197,7 +197,7 @@
         },
         "functions_math" : {
             "name":"support.function.math.macro",
-            "match":"(?i)(?<=^|\\W|\\d)(SIN|COS|TAN|ASIN|ACOS|ATAN|SQRT|ABS|BIN|BCD|ROUND|FIX|FUP|LN|EXP|POW|ADP|PRM)(?=\\s*\\[)"
+            "match":"(?i)(?<=^|\\W|\\d)(SIN|COS|TAN|ASIN|ACOS|ATAN|ATN|SQRT|SQR|ABS|BIN|BCD|ROUND|RND|FIX|FUP|LN|EXP|POW|ADP|PRM)(?=\\s*\\[)"
         },
         "functions_command" : {
             "name":"support.function.macro",