Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/tests #23

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/tests #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e263920
Adds initial partest.q file and testing notebook
nipsn Apr 5, 2024
e1b3add
testing script
tortolavivo23 Apr 10, 2024
84255bb
Improvements in testing
tortolavivo23 Apr 12, 2024
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
341 changes: 341 additions & 0 deletions test/partest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,341 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 2,
"id": "ec4cacce-8d3d-44ae-8f5b-75c7234ecd57",
"metadata": {},
"outputs": [
{
"ename": "\u001b[0;31m../querqus.q. OS reports: No such file or directory\u001b[0m",
"evalue": "\u001b[0;31m../querqus.q. OS reports: No such file or directory\u001b[0m",
"output_type": "error",
"traceback": [
"\u001b[0;31mevaluation error:\n\u001b[0m",
"\u001b[0;31m../querqus.q. OS reports: No such file or directory\u001b[0m",
"\u001b[0;31m\u001b[0m",
"\u001b[0;31m [0] \\l ../querqus.q\n ^\n\u001b[0m"
]
}
],
"source": [
"\\l ../querqus.q"
]
},
{
"cell_type": "code",
"execution_count": 1,
"id": "edfeae9b-a526-4b64-b934-1c54630bf381",
"metadata": {},
"outputs": [],
"source": [
"/ quercus: parser combinators for q\n",
"\\d .qu\n",
"\n",
"ret:{enlist(x;y)};\n",
"bind:{raze({(a;s):y;x[a]s}[x]')y@};\n",
"map:{bind[(ret x::)]};\n",
"trav:{({bind[{map[{raze(x;y)}[y]][x]}[y]]x}/)(x')y};\n",
"seqA:trav[::];\n",
"zero:{[x]()};\n",
"plus:{x[z],y z};\n",
"fil:{bind[{(zero;ret y)x y}[x]][y]};\n",
"opt:{plus[x;ret()]};\n",
"many:{plus[bind[{map[(enlist[z],)]y x}[x;.z.s];x];ret()]};\n",
"many1:{bind[{map[(enlist[y],)]many x}[x];x]};\n",
"times:{$[x<1;ret();seqA x#y]};\n",
"sep1:{bind[{map[{enlist[x],y}[z]]many seqr[x;y]}[y;x]]x};\n",
"sep:{plus[sep1[x;y];ret()]};\n",
"skip:map zero;\n",
"item:{$[\"\"~x;();enlist(first x;1_ x)]};\n",
"seqf:{bind[{map[{x(y;z)}[x;z]][y]}[x;z]]y};\n",
"seql:seqf[first];seqr:seqf[last];seq:seqf[enlist .];\n",
"sat:{bind[{$[x y;ret y;zero]}[x];item]};\n",
"oneof:{sat in[;x]};\n",
"noneof:{sat(not in[;x]::)};\n",
"between:{seqr[x;seql[z;y]]};\n",
"range:{sat{(x<=z)&z<=y}[x;y]};\n",
"digit:range .\"09\";\n",
"lwr:range .\"az\";\n",
"upr:range .\"AZ\";\n",
"letter:plus[lwr;upr];\n",
"alphanum:plus[letter;digit];\n",
"str:{$[x~count[x]#y;enlist(x;count[x]_y);()]};\n",
"word:many1 letter;\n",
"num:many1 digit;\n",
"chr:{[x:`c]sat[(x=)]};\n",
"spaces:skip many space:chr\" \";\n",
"eof:{$[\"\"~x;ret[()]x;zero x]};\n",
"parens:between[chr\"(\";chr\")\"];\n",
"braces:between[chr\"{\";chr\"}\"];\n",
"c:item;\n",
"j:map[(\"J\"$)]num;\n",
"s:map[(`$)]word;\n",
"\n",
"rparse:{$[()~r:x y;'`parse;1<count r;'`ambig;[(a;s):r 0;not \"\"~s];'`spare;a]};\n",
"vparse:{.[{[x]1b}rparse::;(x;y);0b]};\n",
"\n",
"\\d ."
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "7dce4d10-4251-4d61-85b2-e87318462f93",
"metadata": {},
"outputs": [],
"source": [
"// parse: encontró lo que no debía\n",
"// spare: quedan cosas por parsear\n",
"// ambig: ambiguedad"
]
},
{
"cell_type": "code",
"execution_count": 2,
"id": "08213db5-5b4a-4957-9c4c-0676f1ad7a34",
"metadata": {},
"outputs": [],
"source": [
"test:{z~.[.qu.rparse;(x;y);::]}"
]
},
{
"cell_type": "code",
"execution_count": 3,
"id": "7759fcca-ac4b-493c-b954-ae3846e68f30",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"1b\n"
]
},
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"test[.qu.lwr;enlist\"a\";\"a\"]"
]
},
{
"cell_type": "code",
"execution_count": 4,
"id": "ad90d8e1-19df-4570-bbdf-e61843357120",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"1b\n"
]
},
"execution_count": 4,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"test[.qu.lwr;\"ab\";\"spare\"]"
]
},
{
"cell_type": "code",
"execution_count": 5,
"id": "70faece3-f32c-4116-832e-880d757bf8e4",
"metadata": {},
"outputs": [],
"source": [
"testtime:{[parser;input;expected;times]\n",
" do[times;r,:(system\"t [parser][input]\")];\n",
" expected>=avg r}"
]
},
{
"cell_type": "code",
"execution_count": 5,
"id": "43824611-4d0b-4c52-9c43-0df6e02dbc3d",
"metadata": {},
"outputs": [
{
"ename": "\u001b[0;31minput\u001b[0m",
"evalue": "\u001b[0;31minput\u001b[0m",
"output_type": "error",
"traceback": [
"\u001b[0;31mevaluation error:\n\u001b[0m",
"\u001b[0;31minput\u001b[0m",
"\u001b[0;31m\u001b[0m",
"\u001b[0;31m [2] \\t [parser][input]\n ^\n\u001b[0m",
"\u001b[0;31m [1] testtime:{[parser;input;expected;times]\n do[times;r,:(system\"t [parser][input]\")];\n ^\n expected>=avg r}\n\u001b[0m",
"\u001b[0;31m [0] testtime[.qu.times[2;.qu.lwr];\"ab\";1;30]\n ^\n\u001b[0m"
]
}
],
"source": [
"testtime[.qu.times[2;.qu.lwr];\"ab\";1;30]"
]
},
{
"cell_type": "code",
"execution_count": 34,
"id": "db86fefd-2df9-4852-8ada-536c73f3f07e",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"0\n"
]
},
"execution_count": 34,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"/ si se guardan parser e input como globales la celda anterior funciona\n",
"/ quizá los \"fstring\" tiran de variables globales. si es el caso no interesa\n",
"/ habría que buscar una alternativa... (o no)\n",
"parser:.qu.lwr\n",
"input:enlist\"a\"\n",
"\n",
"system\"t [parser][input]\""
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "2c00b295-148a-4af9-a18d-a39f9be47e43",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "9f32e96d-ef18-477d-9bc0-4f071f72b08b",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": 24,
"id": "9535254e-9172-4876-a612-517e46a5becf",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"foo bar baz\n",
"-----------\n",
"3 4 5 \n",
"3 4 5 \n",
"4 4 4 \n"
]
},
"execution_count": 24,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"flip (!). flip((`foo;(3;3;4));\n",
" (`bar;(4;4;4));\n",
" (`baz;(5;5;4)))"
]
},
{
"cell_type": "code",
"execution_count": 19,
"id": "8acbda75-28c2-4c8f-9d88-785858a8268f",
"metadata": {},
"outputs": [],
"source": [
"timest:flip(!). flip((`func;`times);\n",
" (`parser;(\".qu.times[2;.qu.digit]\";\".qu.times[3;.qu.digit]\"));\n",
" (`inputs;(\"12\";\"123\"));\n",
" (`expected;(\"12\";\"spare\")))"
]
},
{
"cell_type": "code",
"execution_count": 20,
"id": "abef91e7-2363-4be4-a52a-2f6c85408346",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"func parser inputs expected\n",
"----------------------------------------------\n",
"times \".qu.times[2;.qu.digit]\" \"12\" \"12\" \n",
"times \".qu.times[3;.qu.digit]\" \"123\" \"spare\" \n"
]
},
"execution_count": 20,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"timest"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "ef6b05b5-b62b-45b4-bea2-1b2118edaa2e",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": 22,
"id": "936e261d-81e4-4397-8b86-b36079cafbba",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"\"12\" \"\"\n"
]
},
"execution_count": 22,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"{expected~(eval parse parser)[input]}"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "2ec3c4b9-62ef-45c8-92ee-a11f82abe649",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Q (kdb+)",
"language": "q",
"name": "qpk"
},
"language_info": {
"file_extension": ".q",
"mimetype": "text/x-q",
"name": "q",
"version": "4.1.0"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
19 changes: 19 additions & 0 deletions test/partest.q
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
\l quercus.q
\l test/tests.q

test:{z~.[.qu.rparse;(x;y);::]};
testtime:{[parser;input;expected;times]
system "t ",parser,input}
evaluation:{{test[x;y;z]}' [x[`parser];x[`input];x[`expected]]};

f:{({{$[(type[x]<0) or type[x]>20;enlist x;x]} each x} each `expected _ x), ([expected: x `expected])};
g:{{$[type[x]=0;x;enlist x]} each x}
h: {$[type[x]=0;`args`input`expected!flip x;x]}
addTests: {
k!{
v:f g h x y;
(&/)evaluation[v,flip([]parser:{
op:get[`.qu]x;
$[count[y]>0;op . y;op]}[y;] peach v `args)]}[t;] peach k:1 _ key t:get`.test};

tests: ([]function: key s;test: value s:addTests[])
10 changes: 10 additions & 0 deletions test/tests.q
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// begin tests
\d .test
times: ([args:((2;.qu.digit);(3;.qu.digit);(2;.qu.lwr)); input: ("12";"1234";"ab"); expected: ("12";"spare";"ab")]);
lwr: ([args:(();());input:("a";"abc");expected:("a";"spare")]);
many: ([args:(.qu.digit;.qu.lwr;.qu.lwr);input:("123";"abcd";"");expected:("ambig";"ambig";())]);
many1: ([args:.qu.digit;input: "";expected: "parse"]);
range: ([args: ("25";"ad";"az");input:(enlist "3";enlist "b"; enlist "A"); expected:("3";"b";"parse")]);
word: `args`input`expected!((();();());("hello";"a";"abc1");("ambig";enlist"a";"ambig"));
braces: ((.qu.word;"{hello}";"hello");(.qu.word;"{hello";"parse"))
\d .
Copy link
Member

@neutropolis neutropolis Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

times_0:`a`i`o!(2,qu.digit;"12";"12");
times_1:`a`i`e!(3,.qu.digit;"1234";`spare);
times_2:`a`i`o!(2,.qu.lwr;"ab";"ab");
lwr_0:`i`o!(enlist"a";"a");
lwr_1:`i`e!("abc";`spare);
lwr_11:`p`i`o!(`raw;"abc";("a";"bc"));
many_0:`p`a`i`o!(`raw;.qu.digit;"123";(("1";"23");("12";"3");("123";())));
braces_0:`p`a`i!(`valid;.qu.word;"{hello}");