Changeset 20818 for lang/cplusplus

Timestamp:

10/05/08 23:35:19 (2 months ago)

Author:

tokuhirom

Message:

refactoring document generator

Location:

lang/cplusplus/llv8call/trunk

Files:

• manual/ext/index.html (modified) (2 diffs)
• t/020_ext/08_clearsilver.js (modified) (1 diff)
• tools/makedoc/make-docs.js (modified) (3 diffs)

lang/cplusplus/llv8call/trunk/manual/ext/index.html

@@ -19 +19 @@
         <ul>
             <li><a href="clearsilver/clearsilver.html">clearsilver.clearsilver</a></li>
-            <li><a href="sqlite3/sqlite3.html">sqlite3.sqlite3</a></li>
             <li><a href="fs/dir.html">fs.dir</a></li>
             <li><a href="fs/file.html">fs.file</a></li>
@@ -25 +24 @@
             <li><a href="mysql/mysql.html">mysql.mysql</a></li>
             <li><a href="shttpd/shttpd.html">shttpd.shttpd</a></li>
+            <li><a href="sqlite3/sqlite3.html">sqlite3.sqlite3</a></li>
         </ul>
         <a href="../index.html">up</a>

lang/cplusplus/llv8call/trunk/t/020_ext/08_clearsilver.js

@@ -37 +37 @@
 }());
 
+(function () {
+    clearsilver.HDF.prototype.SetAny = function (base, stuff) {
+        switch (typeof stuff) {
+        case 'boolean':
+        case 'string':
+        case 'null':
+        case 'number':
+            this.SetValue(base, stuff);
+            break;
+        case 'object':
+        case 'array':
+            for (key in stuff) {
+                this.SetAny(base + "." + key, stuff[key]);
+            }
+            break;
+        case 'function':
+            throw "cannot use function";
+        default:
+            throw "unknown stuff: " + typeof(stuff);
+        }
+    };
+
+    var test = function (stuff, expected) {
+        var hdf = new clearsilver.HDF();
+        hdf.SetAny("data", stuff);
+        is(hdf.DumpStr(undefined, 0), expected);
+        hdf.Close();
+    };
+
+    test(1, "data = 1\n");
+    test([1,2,3],
+        "data.0 = 1\n" +
+        "data.1 = 2\n" +
+        "data.2 = 3\n"
+    );
+    test({"foo":"bar", "baz":"eee"},
+        "data.foo = bar\n" +
+        "data.baz = eee\n"
+    );
+    test({"foo":[1,2,3], "baz":"eee"},
+        "data.foo.0 = 1\n" +
+        "data.foo.1 = 2\n" +
+        "data.foo.2 = 3\n" +
+        "data.baz = eee\n"
+    );
+}());
+

lang/cplusplus/llv8call/trunk/tools/makedoc/make-docs.js

@@ -4 +4 @@
 var TMPLDIR = 'tools/makedoc/tmpl';
 
-clearsilver.HDF.prototype.AddArray = function (basekey, ary) {
-    for (var i=0; i<ary.length; i++) {
-        this.SetValue(basekey + "." + i, ary[i]);
-    }
-};
-clearsilver.HDF.prototype.AddHash = function (basekey, hash) {
-    for (i in hash) {
-        this.SetValue(basekey + "." + i, hash[i]);
+clearsilver.HDF.prototype.SetAny = function (base, stuff) {
+    switch (typeof stuff) {
+    case 'boolean':
+    case 'string':
+    case 'null':
+    case 'number':
+        this.SetValue(base, stuff);
+        break;
+    case 'object':
+    case 'array':
+        for (key in stuff) {
+            this.SetAny(base + "." + key, stuff[key]);
+        }
+        break;
+    case 'function':
+        throw "cannot use function";
+    default:
+        throw "unknown stuff: " + typeof(stuff);
     }
 };
@@ -60 +70 @@
         var hdf = new clearsilver.HDF();
         var res;
-        for (var i=0; i<data.modules.length; i++) {
-            var entry = data.modules[i];
-            var basekey = "data.modules." + i
-            hdf.SetValue(basekey + ".CLASSNAME", entry['CLASSNAME']);
-            hdf.AddArray(basekey + ".CCV", entry["CCV"]);
-            hdf.AddArray(basekey + ".CM",  entry["CM"]);
-            hdf.AddArray(basekey + ".IM",  entry["IM"]);
-        }
-        if(data.sections.SYNOPSIS) {
-            hdf.SetValue("data.sections.SYNOPSIS", data.sections.SYNOPSIS);
-        }
-        if(data.sections.DESCRIPTION) {
-            hdf.SetValue("data.sections.DESCRIPTION", data.sections.DESCRIPTION);
-        }
-        // p(hdf.DumpStr(undefined, 0));
+        hdf.SetAny("data", data);
+        //p(hdf.DumpStr(undefined, 0));
         var cs = new clearsilver.CS(hdf);
         cs.ParseFile(TMPLDIR + "/doc.cs");
@@ -144 +141 @@
             var res;
             for (i in pages) {
-                hdf.AddHash("pages." + i, {"url":pages[i], "title":pages[i].replace(".html", '').replace("/", ".")});
+                hdf.SetAny("pages." + i, {"url":pages[i], "title":pages[i].replace(".html", '').replace("/", ".")});
             }
             // p(hdf.DumpStr(undefined, 0));