diff --git a/lib/modules/Tools.pmod/Hilfe.pmod b/lib/modules/Tools.pmod/Hilfe.pmod index cecb7f266e616b516d796ef337aa5e4d061b11a0..f89a8338eb22f392b4d488b04a93c031539d83db 100644 --- a/lib/modules/Tools.pmod/Hilfe.pmod +++ b/lib/modules/Tools.pmod/Hilfe.pmod @@ -4,7 +4,7 @@ // Incremental Pike Evaluator // -constant cvs_version = ("$Id: Hilfe.pmod,v 1.125 2006/10/31 00:31:05 nilsson Exp $"); +constant cvs_version = ("$Id: Hilfe.pmod,v 1.126 2006/10/31 00:37:36 nilsson Exp $"); constant hilfe_todo = #"List of known Hilfe bugs/room for improvements: - Hilfe can not handle enums. @@ -281,7 +281,7 @@ private class CommandSet { else { // FIXME: We should do a real string compilation. f = replace(f, ([ "\\n":"\n", "\\\"":"\"" ]) ); - e->reswrite = Reswriter(f[1..sizeof(f)-2]); + e->reswrite = Reswriter(f[1..<1]); } return; } @@ -726,7 +726,7 @@ private class SubSysPhish { return 0; } - array c = cmd[..sizeof(cmd)-2]/" "; + array c = cmd[..<1]/" "; if(e->commands[c[0]] || cmd==".\n") return 0; @@ -1859,17 +1859,17 @@ class Evaluator { case "inherit": { - inherits += ({ expr[1..sizeof(expr)-2] }); + inherits += ({ expr[1..<1] }); if(!hilfe_compile("")) - inherits = inherits[..sizeof(inherits)-2]; + inherits = inherits[..<1]; return 0; } case "import": { - imports += ({ expr[1..sizeof(expr)-2] }); + imports += ({ expr[1..<1] }); if(!hilfe_compile("")) - imports = imports[..sizeof(imports)-2]; + imports = imports[..<1]; return 0; } diff --git a/lib/modules/Tools.pmod/Install.pmod b/lib/modules/Tools.pmod/Install.pmod index d7f5a9d4f73883b8253858e1392ed04e47761032..86cc2dca1837a9cf133e24890a2f7f5ac693f22c 100644 --- a/lib/modules/Tools.pmod/Install.pmod +++ b/lib/modules/Tools.pmod/Install.pmod @@ -246,12 +246,12 @@ class Readline array(string) path = make_absolute_path(text[..pos-1], cwd)/"/"; array(string) files = glob(path[-1]+"*", - get_dir(sizeof(path)>1? path[..sizeof(path)-2]*"/"+"/":".")||({})); + get_dir(sizeof(path)>1? path[..<1]*"/"+"/":".")||({})); if(match_directories_only) files = Array.filter(files, lambda(string f, string p) { return Stdio.is_dir(p + f); }, - path[..sizeof(path)-2]*"/"+"/"); + path[..<1]*"/"+"/"); switch(sizeof(files)) { @@ -260,7 +260,7 @@ class Readline break; case 1: insert(files[0][sizeof(path[-1])..], pos); - if( Stdio.is_dir( (path[..sizeof(path)-2]+files) * "/" ) ) + if( Stdio.is_dir( (path[..<1]+files) * "/" ) ) insert("/", getcursorpos()); break; default: