Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ All notable changes to the [VSCode NLP++ extension](http://vscode.visualtext.org

Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.

### 3.11.12
NLP++ math functions: `floor`, `ceiling`, `round` and friends.

- The editor now knows the new engine math builtins — `floor`, `ceiling`, `round`, `truncate`, `sqrt`, `pow` and `log` — so they colorize as functions and offer completions and snippets.
- Also registers `abs`, `mod` and `randomint`, which the engine has had for a while but which were never added to the grammar or language data (they had snippets but showed up unhighlighted).

### 3.11.11
Parse-tree graphic: stagger overlapping labels at every level.

Expand Down
2 changes: 1 addition & 1 deletion dist/extension.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/extension.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "NLP",
"description": "NLP++: the only computer programming language built for NLP — create and visually debug analyzers directly in VS Code.",
"icon": "resources/NLPppLogo.png",
"version": "3.11.11",
"version": "3.11.12",
"publisher": "dehilster",
"enableApiProposals": false,
"engines": {
Expand Down
49 changes: 49 additions & 0 deletions snippets/nlp.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,67 @@
{
"ceiling": {
"prefix": ["ceiling"],
"body": [
"ceiling(${1:numFlt})"
],
"description": "Round a number up to the nearest whole number."
},
"floor": {
"prefix": ["floor"],
"body": [
"floor(${1:numFlt})"
],
"description": "Round a number down to the nearest whole number."
},
"log": {
"prefix": ["log"],
"body": [
"log(${1:numFlt})"
],
"description": "Compute the natural (base e) logarithm of a number."
},
"N": {
"prefix": ["N(\"$text\",1)"],
"body": [
"N(\"\\$text\",${1:1})"
],
"description": "Node variable with $text value."
},
"pow": {
"prefix": ["pow"],
"body": [
"pow(${1:baseFlt},${2:exponentFlt})"
],
"description": "Raise a number to the given power."
},
"round": {
"prefix": ["round"],
"body": [
"round(${1:numFlt})"
],
"description": "Round a number to the nearest whole number."
},
"S": {
"prefix": ["S(\"something\") = "],
"body": [
"S(\"${1:1}\") = "
],
"description": "Suggested variable."
},
"sqrt": {
"prefix": ["sqrt"],
"body": [
"sqrt(${1:numFlt})"
],
"description": "Compute the square root of a number."
},
"truncate": {
"prefix": ["truncate"],
"body": [
"truncate(${1:numFlt})"
],
"description": "Discard the fractional part of a number, rounding toward zero."
},
"X": {
"prefix": ["X(\"something\",1) = "],
"body": [
Expand Down
20 changes: 10 additions & 10 deletions src/language/nlpxxData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,32 +47,32 @@ export const LETTER_FUNCTIONS: Record<string, string> = {

// Built-in functions (grammar: entity.name.function.nlp). Transcribed verbatim.
export const BUILTIN_FUNCTIONS: string[] = [
"addarg", "addattr", "addcnode", "addconcept", "addconval", "addnode",
"abs", "addarg", "addattr", "addcnode", "addconcept", "addconval", "addnode",
"addnumval", "addstmt", "addstrs", "addstrval", "addsval", "addword",
"arraylength", "attrchange", "attrexists", "attrname", "attrtype",
"attrvals", "attrwithval", "batchstart", "cap", "cbuf", "closefile",
"attrvals", "attrwithval", "batchstart", "cap", "cbuf", "ceiling", "closefile",
"conceptname", "conceptpath", "conval", "cout", "coutreset", "dballocstmt",
"dbbindcol", "dbclose", "dbexec", "dbexecstmt", "dbfetch", "dbfreestmt",
"dbopen", "deaccent", "debug", "dictfindword", "dictfirst", "dictgetword",
"dictnext", "down", "else", "eltnode", "excise", "exitpass", "exittopopup",
"factorial", "fail", "fileout", "findana", "findattr", "findattrs",
"findconcept", "findhierconcept", "findnode", "findphrase", "findroot",
"findvals", "findwordpath", "firstnode", "flt", "fltval", "fncallstart",
"findvals", "findwordpath", "firstnode", "floor", "flt", "fltval", "fncallstart",
"fprintgvar", "fprintnvar", "fprintxvar", "fprintvar", "gdump", "getconcept",
"getconval", "getnumval", "getpopupdata", "getstrval", "getsval", "ginc",
"gp", "group", "gtolower", "guniq", "hitconf", "if", "inc", "inheritval",
"inputrange", "inputrangetofile", "interactive", "kbdumptree", "lasteltnode",
"lastnode", "length", "lengthr", "levenshtein", "lextagger", "listadd",
"listnode", "LJ", "lj", "logten", "lookup", "lowercase", "makeconcept",
"listnode", "LJ", "lj", "log", "logten", "lookup", "lowercase", "makeconcept",
"makeparentconcept", "makephrase", "makestmt", "merge", "merger", "mkdir",
"movecleft", "movecright", "movesem", "ndump", "next", "nextattr", "nextval",
"mod", "movecleft", "movecright", "movesem", "ndump", "next", "nextattr", "nextval",
"ninc", "nodeconcept", "nodeowner", "noop", "num", "numrange", "numval",
"openfile", "or", "pathconcept", "percentstr", "permuten", "phraselength",
"phraseraw", "phrasetext", "pncopyvars", "pndown", "pninsert", "pnmakevar",
"pnname", "pnnext", "pnprev", "pnreplaceval", "pnroot", "pnsingletdown",
"pnup", "pnvar", "pnvarnames", "pranchor", "prchild", "preaction",
"pnup", "pnvar", "pnvarnames", "pow", "pranchor", "prchild", "preaction",
"printvar", "pndeletechilds", "pnrename", "prev", "print", "printr", "prlit",
"prrange", "prtree", "prunephrases", "prxtree", "regexp", "regexpi",
"prrange", "prtree", "prunephrases", "prxtree", "randomint", "regexp", "regexpi",
"renameattr", "renamechild", "renameconcept", "renamenode", "replaceval",
"resolveurl", "return", "returnstmt", "rfaaction", "rfaactions", "rfaarg",
"rfaargtolist", "rfacode", "rfaelement", "rfaelt", "rfaexpr", "rfalist",
Expand All @@ -83,18 +83,18 @@ export const BUILTIN_FUNCTIONS: string[] = [
"rfarules", "rfarulesfile", "rfaselect", "rfastr", "rfasugg", "rfaunary",
"rfavar", "rfbarg", "rfbdecl", "rfbdecls", "rightjustifynum", "rmattr",
"rmattrs", "rmattrval", "rmchild", "rmchildren", "rmconcept", "rmcphrase",
"rmnode", "rmphrase", "rmval", "rmvals", "rmword", "sdump", "setbase",
"rmnode", "rmphrase", "rmval", "rmvals", "rmword", "round", "sdump", "setbase",
"setlookahead", "setunsealed", "single", "singler", "singlex", "singlezap",
"sortconsbyattr", "sortchilds", "sorthier", "sortphrase", "sortvals",
"spellcandidates", "spellcorrect", "spellword", "splice", "split", "sqlstr",
"startout", "stem", "stopout", "str", "strchar", "strchr", "strchrcount",
"sqrt", "startout", "stem", "stopout", "str", "strchar", "strchr", "strchrcount",
"strclean", "strcontains", "strcontainsnocase", "strendswith", "strequal",
"strequalnocase", "strescape", "strunescape", "strgreaterthan", "strisalpha",
"strisdigit", "strislower", "strisupper", "strlength", "strlessthan",
"strnotequal", "strnotequalnocase", "strpiece", "strrchr",
"strspellcandidate", "strspellcompare", "strstartswith", "strsubst",
"strtolower", "strtotitle", "strtoupper", "strtrim", "strval", "strwrap",
"succeed", "suffix", "system", "take", "today", "topdir", "unknown",
"succeed", "suffix", "system", "take", "today", "topdir", "truncate", "unknown",
"unpackdirs", "up", "uppercase", "urlbase", "urltofile", "var", "vareq",
"varfn", "varfnarray", "varinlist", "varne", "varstrs", "varz", "wninit",
"wnsensestoconcept", "wnhypnymstoconcept", "while", "whilestmt", "wordindex",
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/nlp.tmLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"functions": {
"name": "entity.name.function.nlp",
"match": "\\b(?i:(addarg|addattr|addcnode|addconcept|addconval|addnode|addnumval|addstmt|addstrs|addstrval|addsval|addword|arraylength|attrchange|attrexists|attrname|attrtype|attrvals|attrwithval|batchstart|cap|cbuf|closefile|conceptname|conceptpath|conval|cout|coutreset|dballocstmt|dbbindcol|dbclose|dbexec|dbexecstmt|dbfetch|dbfreestmt|dbopen|deaccent|debug|dictfindword|dictfirst|dictgetword|dictnext|down|else|eltnode|excise|exitpass|exittopopup|factorial|fail|fileout|findana|findattr|findattrs|findconcept|findhierconcept|findnode|findphrase|findroot|findvals|findwordpath|firstnode|flt|fltval|fncallstart|fprintgvar|fprintnvar|fprintxvar|fprintvar|gdump|getconcept|getconval|getnumval|getpopupdata|getstrval|getsval|ginc|gp|group|gtolower|guniq|hitconf|if|inc|inheritval|inputrange|inputrangetofile|interactive|kbdumptree|lasteltnode|lastnode|length|lengthr|levenshtein|lextagger|listadd|listnode|LJ|lj|logten|lookup|lowercase|makeconcept|makeparentconcept|makephrase|makestmt|merge|merger|mkdir|movecleft|movecright|movesem|ndump|next|nextattr|nextval|ninc|nodeconcept|nodeowner|noop|num|numrange|numval|openfile|or|pathconcept|percentstr|permuten|phraselength|phraseraw|phrasetext|pncopyvars|pndown|pninsert|pnmakevar|pnname|pnnext|pnprev|pnreplaceval|pnroot|pnsingletdown|pnup|pnvar|pnvarnames|pranchor|prchild|preaction|printvar|pndeletechilds|pnrename|prev|print|printr|prlit|prrange|prtree|prunephrases|prxtree|regexp|regexpi|renameattr|renamechild|renameconcept|renamenode|replaceval|resolveurl|return|returnstmt|rfaaction|rfaactions|rfaarg|rfaargtolist|rfacode|rfaelement|rfaelt|rfaexpr|rfalist|rfalitelt|rfalittoaction|rfalittopair|rfaname|rfanodes|rfanonlit|rfanonlitelt|rfanum|rfaop|rfapair|rfapairs|rfapostunary|rfapres|rfarange|rfarecurse|rfarecurses|rfaregion|rfaregions|rfarule|rfarulelts|rfarulemark|rfarules|rfarulesfile|rfaselect|rfastr|rfasugg|rfaunary|rfavar|rfbarg|rfbdecl|rfbdecls|rightjustifynum|rmattr|rmattrs|rmattrval|rmchild|rmchildren|rmconcept|rmcphrase|rmnode|rmphrase|rmval|rmvals|rmword|sdump|setbase|setlookahead|setunsealed|single|singler|singlex|singlezap|sortconsbyattr|sortchilds|sorthier|sortphrase|sortvals|spellcandidates|spellcorrect|spellword|splice|split|sqlstr|startout|stem|stopout|str|strchar|strchr|strchrcount|strclean|strcontains|strcontainsnocase|strendswith|strequal|strequalnocase|strescape|strunescape|strgreaterthan|strisalpha|strisdigit|strislower|strisupper|strlength|strlessthan|strnotequal|strnotequalnocase|strpiece|strrchr|strspellcandidate|strspellcompare|strstartswith|strsubst|strtolower|strtotitle|strtoupper|strtrim|strval|strwrap|succeed|suffix|system|take|today|topdir|unknown|unpackdirs|up|uppercase|urlbase|urltofile|var|vareq|varfn|varfnarray|varinlist|varne|varstrs|varz|wninit|wnsensestoconcept|wnhypnymstoconcept|while|whilestmt|wordindex|wordpath|writekb|xaddlen|xaddnvar|xdump|xinc|xmlstr|xrename))\\b"
"match": "\\b(?i:(abs|addarg|addattr|addcnode|addconcept|addconval|addnode|addnumval|addstmt|addstrs|addstrval|addsval|addword|arraylength|attrchange|attrexists|attrname|attrtype|attrvals|attrwithval|batchstart|cap|cbuf|ceiling|closefile|conceptname|conceptpath|conval|cout|coutreset|dballocstmt|dbbindcol|dbclose|dbexec|dbexecstmt|dbfetch|dbfreestmt|dbopen|deaccent|debug|dictfindword|dictfirst|dictgetword|dictnext|down|else|eltnode|excise|exitpass|exittopopup|factorial|fail|fileout|findana|findattr|findattrs|findconcept|findhierconcept|findnode|findphrase|findroot|findvals|findwordpath|firstnode|floor|flt|fltval|fncallstart|fprintgvar|fprintnvar|fprintxvar|fprintvar|gdump|getconcept|getconval|getnumval|getpopupdata|getstrval|getsval|ginc|gp|group|gtolower|guniq|hitconf|if|inc|inheritval|inputrange|inputrangetofile|interactive|kbdumptree|lasteltnode|lastnode|length|lengthr|levenshtein|lextagger|listadd|listnode|LJ|lj|log|logten|lookup|lowercase|makeconcept|makeparentconcept|makephrase|makestmt|merge|merger|mkdir|mod|movecleft|movecright|movesem|ndump|next|nextattr|nextval|ninc|nodeconcept|nodeowner|noop|num|numrange|numval|openfile|or|pathconcept|percentstr|permuten|phraselength|phraseraw|phrasetext|pncopyvars|pndown|pninsert|pnmakevar|pnname|pnnext|pnprev|pnreplaceval|pnroot|pnsingletdown|pnup|pnvar|pnvarnames|pow|pranchor|prchild|preaction|printvar|pndeletechilds|pnrename|prev|print|printr|prlit|prrange|prtree|prunephrases|prxtree|randomint|regexp|regexpi|renameattr|renamechild|renameconcept|renamenode|replaceval|resolveurl|return|returnstmt|rfaaction|rfaactions|rfaarg|rfaargtolist|rfacode|rfaelement|rfaelt|rfaexpr|rfalist|rfalitelt|rfalittoaction|rfalittopair|rfaname|rfanodes|rfanonlit|rfanonlitelt|rfanum|rfaop|rfapair|rfapairs|rfapostunary|rfapres|rfarange|rfarecurse|rfarecurses|rfaregion|rfaregions|rfarule|rfarulelts|rfarulemark|rfarules|rfarulesfile|rfaselect|rfastr|rfasugg|rfaunary|rfavar|rfbarg|rfbdecl|rfbdecls|rightjustifynum|rmattr|rmattrs|rmattrval|rmchild|rmchildren|rmconcept|rmcphrase|rmnode|rmphrase|rmval|rmvals|rmword|round|sdump|setbase|setlookahead|setunsealed|single|singler|singlex|singlezap|sortconsbyattr|sortchilds|sorthier|sortphrase|sortvals|spellcandidates|spellcorrect|spellword|splice|split|sqlstr|sqrt|startout|stem|stopout|str|strchar|strchr|strchrcount|strclean|strcontains|strcontainsnocase|strendswith|strequal|strequalnocase|strescape|strunescape|strgreaterthan|strisalpha|strisdigit|strislower|strisupper|strlength|strlessthan|strnotequal|strnotequalnocase|strpiece|strrchr|strspellcandidate|strspellcompare|strstartswith|strsubst|strtolower|strtotitle|strtoupper|strtrim|strval|strwrap|succeed|suffix|system|take|today|topdir|truncate|unknown|unpackdirs|up|uppercase|urlbase|urltofile|var|vareq|varfn|varfnarray|varinlist|varne|varstrs|varz|wninit|wnsensestoconcept|wnhypnymstoconcept|while|whilestmt|wordindex|wordpath|writekb|xaddlen|xaddnvar|xdump|xinc|xmlstr|xrename))\\b"
},
"expression": {
"name": "meta.expression.nlp",
Expand Down