diff --git a/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod b/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod index 4ccc3ab6dd8d733f868e266add980ba4aad2795d..465f27d5f6e94284f06847567af2d70882023e0b 100644 --- a/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod +++ b/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod @@ -77,21 +77,21 @@ class IntType { class StringType { inherit Type; - string minwidth; - string maxwidth; + string min; + string max; void create() { ::create("string"); } string print() { - if (minwidth||maxwidth) - return "string(" + (minwidth ? minwidth : "") - + ".." + (maxwidth ? maxwidth : "") + ")"; + if (min||max) + return "string(" + (min ? min : "") + + ".." + (max ? max : "") + ")"; else return "string"; } string xml() { - if (minwidth||maxwidth) + if (min||max) return xmltag("string", - xmltag("minwidth", minwidth) + - xmltag("maxwidth", maxwidth)); + xmltag("min", min) + + xmltag("max", max)); return xmltag("string"); } } diff --git a/lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike b/lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike index cf1225c32762a3922d0da28422c390c3d68e857f..5a97cf2808d6ebf0c6fd87aeab1adce25c28f269 100644 --- a/lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike +++ b/lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike @@ -323,10 +323,10 @@ StringType parseString() { if (peekToken() == "(") { readToken(); if (peekToken() != "..") - s->minwidth = eatLiteral(); + s->min = eatLiteral(); eat(".."); if (peekToken() != ")") - s->maxwidth = eatLiteral(); + s->max = eatLiteral(); eat(")"); } return s; diff --git a/refdoc/xml.txt b/refdoc/xml.txt index 4c5b500c8ec2ba4f72676441043379aa05a572d6..abbb3cde5f82d3bf905c628c11d2dd0dbe6ce5ca 100644 --- a/refdoc/xml.txt +++ b/refdoc/xml.txt @@ -324,12 +324,12 @@ int <int><min>0</min><max>MAX</max></int> string - A string type can have a numerical minwidth and/or maxwidth value. + A string type can have a numerical min and/or max character value. The values can be numbers or identifiers: string(0..255) - <string><minwidth>0</minwidth><maxwidth>255</maxwidth></string> + <string><min>0</min><max>255</max></string> mapping The types of the indices and values are given: