xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update test/calc.nas & print function of nasal_vec/nasal_hash

This commit is contained in:
ValKmjolnir 2022-02-11 17:04:27 +08:00
parent 3e7ba4d774
commit 0ccd3c9bd0
2 changed files with 89 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nasal_gc.h
View File

@ -157,17 +157,12 @@ nasal_ref* nasal_vec::get_mem(const int index)
void nasal_vec::print()
{
static int depth=0;
if(!elems.size())
if(!elems.size() || depth>8)
{
std::cout<<"[]";
return;
}
if(++depth>16)
{
std::cout<<"[..]";
--depth;
std::cout<<(elems.size()?"[..]":"[]");
return;
}
++depth;
size_t iter=0;
std::cout<<'[';
for(auto& i:elems)
@ -219,17 +214,12 @@ nasal_ref* nasal_hash::get_mem(const std::string& key)
void nasal_hash::print()
{
static int depth=0;
if(!elems.size())
if(!elems.size() || depth>8)
{
std::cout<<"{}";
return;
}
if(++depth>16)
{
std::cout<<"{..}";
--depth;
std::cout<<(elems.size()?"{..}":"{}");
return;
}
++depth;
size_t iter=0;
std::cout<<'{';
for(auto& i:elems)

92
test/calc.nas
View File

@ -1,5 +1,5 @@
import("lib.nas");
var filename=[
var source=[
"main.cpp ",
"nasal_err.h ",
"nasal_ast.h ",
@ -14,37 +14,83 @@ var filename=[
"nasal_dbg.h ",
"nasal.h "
];
var space=[
" ",
" ",
" ",
"",
"",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
var lib=[
"stl/lib.nas ",
"stl/list.nas ",
"stl/queue.nas ",
"stl/result.nas ",
"stl/sort.nas ",
"stl/stack.nas "
];
var testfile=[
"test/ascii-art.nas ",
"test/auto_crash.nas ",
"test/bf.nas ",
"test/bfconvertor.nas ",
"test/bfs.nas ",
"test/bigloop.nas ",
"test/bp.nas ",
"test/calc.nas ",
"test/choice.nas ",
"test/class.nas ",
"test/exception.nas ",
"test/fib.nas ",
"test/filesystem.nas ",
"test/hexdump.nas ",
"test/json.nas ",
"test/leetcode1319.nas ",
"test/lexer.nas ",
"test/life.nas ",
"test/loop.nas ",
"test/mandel.nas ",
"test/mandelbrot.nas ",
"test/module_test.nas ",
"test/nasal_test.nas ",
"test/pi.nas ",
"test/prime.nas ",
"test/props.nas ",
"test/quick_sort.nas ",
"test/scalar.nas ",
"test/trait.nas ",
"test/turingmachine.nas",
"test/ycombinator.nas "
];
var module=[
"module/fib.cpp "
];
var getname=func(s){
var (len,ch)=(size(s),' '[0]);
for(var i=0;i<len and s[i]!=ch;i+=1);
return substr(s,0,i);
}
var count=func(s,c){
var (cnt,len,ch)=(0,size(s),c[0]);
for(var i=0;i<len;i+=1)
cnt+=(s[i]==ch);
return cnt;
}
func(){
var (bytes,line,semi)=(0,0,0);
forindex(var i;filename){
var s=io.fin(filename[i]);
var (line_cnt,semi_cnt)=(count(s,'\n'),count(s,';'));
println(filename[i],space[i],'| ',line_cnt,' \tline | ',semi_cnt,' \tsemi');
var calc=func(codetype,files){
println(codetype);
var (bytes,line,semi,line_cnt,semi_cnt)=(0,0,0,0,0);
forindex(var i;files){
var s=io.fin(getname(files[i]));
(line_cnt,semi_cnt)=(count(s,'\n'),count(s,';'));
println(files[i],'| ',line_cnt,' \tline | ',semi_cnt,' \tsemi');
bytes+=size(s);
line+=line_cnt;
semi+=semi_cnt;
}
println('total: | ',line,' \tline | ',semi,' \tsemi');
println('bytes: | ',bytes,' bytes| ',int(bytes/1024),' \tkb');
}();
println('bytes: | ',bytes,'\tbytes| ',int(bytes/1024),' \tkb');
}
calc("source code:",source);
calc("lib:",lib);
calc("test file:",testfile);
calc("module:",module);