X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.js;h=a9c9442403fe90487d14a26e8d6a34a50fae6a99;hb=dad53f90789b90b0767d049a5c449b305d64941b;hp=851a45ad97df553c9de873cbf19620ba01c0c2c1;hpb=d4d0b1f7dc259c71f587595e471bcf1cf228189d;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index 851a45a..a9c9442 100644
--- a/JSDOC/Packer.js
+++ b/JSDOC/Packer.js
@@ -1,16 +1,16 @@
 // <script type="text/javascript">
-XObject         = imports.XObject.XObject;
-File            = imports.File.File;
+const XObject         = imports.XObject.XObject;
+const File            = imports.File.File;
 
-TextStream      = imports.JSDOC.TextStream.TextStream ;
-TokenReader     = imports.TokenReader.TokenReader;
-ScopeParser     = imports.ScopeParser.ScopeParser;
-TokenStream     = imports.TokenStream.TokenStream;
-CompressWhite   = imports.CompressWhite.CompressWhite;
-Collapse        = imports.Collapse.Collapse;
+const TextStream      = imports.JSDOC.TextStream.TextStream ;
+const TokenReader     = imports.TokenReader.TokenReader;
+const ScopeParser     = imports.ScopeParser.ScopeParser;
+const TokenStream     = imports.TokenStream.TokenStream;
+const CompressWhite   = imports.CompressWhite.CompressWhite;
+const Collapse        = imports.Collapse.Collapse;
 
-GLib = imports.gi.GLib;
-Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 /**
  * @namespace JSDOC
  * @class  Packer
@@ -70,7 +70,7 @@ x.packFiles(
  * 
 
  */
-Packer = function(cfg)
+const Packer = function(cfg)
 {
     
     XObject.extend(this, cfg);
@@ -347,8 +347,10 @@ Packer.prototype = {
             print("using MIN FILE  "+ minfile);
             if (str.length) {
                 if (this.target) {
+                    File.append(this.target, '//' + file + "\n");   
                     File.append(this.target, str + "\n");   
                 } else {
+                    this.out += '//' + file + "\n";
                     this.out += str + "\n";
                 }
                 
@@ -424,6 +426,7 @@ Packer.prototype = {
         
          if (out.length) {
             File.write(minfile, out);
+            this.timerPrint("Write (" + out.length + "bytes) " + minfile);
         }
         
         return out;
@@ -457,15 +460,66 @@ Packer.prototype = {
         
         var map = {};  // 'string=> md5sum'
         var _this = this;
-        toks.forEach(function (t) {
-            if (t.type == 'STRN' && t.name == 'DOUBLE_QUOTE') {
-                var sval = t.data.substring(1,t.data.length-1);
-                var ffn = fn.substring(_this.prefix.length);
-                
-                t.trsum = _this.md5(ffn + '-' + sval);
-                map[sval] = t.trsum;
+        var t, last, next;
+        
+        
+        var tokfind =  function (j,dir) {
+            while (1) {
+                if ((dir < 0) && (j < 0)) {
+                    return false;
+                }
+                if ((dir > 0) && (j >= toks.length)) {
+                    return false;
+                }
+                j += dir;
+                if (toks[j].type != 'WHIT') {
+                    return toks[j];
+                }
             }
-        })
+            return false;
+            
+        }
+        
+        
+        for (var i=0;i<toks.length;i++) {
+            
+            t = toks[i];
+            if (t.type != 'STRN') {
+                continue;
+            }
+            if (t.name != 'DOUBLE_QUOTE') {
+                continue;
+            }
+            
+            last = tokfind(i,-1);
+            next = tokfind(i,+1);
+            
+            // we have to ignore key values on objects
+            
+            // defined by
+            // last == '{' or ',' and
+            // next == ':'
+            
+            if (next &&
+                next.type == 'PUNC' &&
+                next.data == ':' && 
+                last && 
+                last.type == 'PUNC' &&
+                (last.data == ',' || last.data == '{')
+            ){
+                continue; // found object key... - we can not translate these
+            }
+                
+            var sval = t.data.substring(1,t.data.length-1);
+            var ffn = fn.substring(_this.prefix.length);
+            
+            t.trsum = _this.md5(ffn + '-' + sval);
+            map[sval] = t.trsum;
+            
+            
+            
+        }
+        
         
         var transfile = minfile + '.lang.trans';
         var transmd5 = minfile + '.lang';
@@ -494,10 +548,11 @@ Packer.prototype = {
             if (!v.length) {
                 continue;
             }
-            File.append(transfile, l + "\n\t" + JSON.stringify(v) + " : " + JSON.stringify(v));
+            File.append(transfile, l + "\n\t\"" + v  + "\" : \"" + v +"\"");
             l = ',';
             // strings are raw... - as the where encoded to start with!!!
-            File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]='+JSON.stringify(v)+";\n");
+            // so we should not need to encode them again.. - just wrap with "
+            File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]="'+v+"\";\n");
         }
         File.append(transfile, "\n},"); // always one trailing..
         
@@ -522,6 +577,12 @@ Packer.prototype = {
             return data;
         }
         
+        if (typeof(tok.trsum) == 'undefined') {
+            return data;
+        }
+        
+        return '_T["' + tok.trsum + '"]';
+        
         var sval = data.substring(1,data.length-1);
         // we do not clean up... quoting here!??!!?!?!?!?