gjs compatibility

diff --git a/File.js b/File.js
index 7cbed3d..ebb74cf 100755 (executable)
--- a/File.js
+++ b/File.js
@@ -1,8 +1,8 @@
 // <script type ="text/Javascript">
-GLib = imports.gi.GLib;
-Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 
-String  = imports.String.String; 
+const String  = imports.String.String; 
 /**
 * @namespace File
 * 
@@ -17,7 +17,7 @@ String  = imports.String.String;
 * 
 * 
 */
-var File = {
+const  File = {
 
     SEPARATOR : '/',
 

diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js
index 71a89fd..07b9d0b 100644 (file)
--- a/JSDOC/Collapse.js
+++ b/JSDOC/Collapse.js
@@ -1,11 +1,12 @@
 //<script type="text/javscript">
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
 
  
-console     = imports.console.console; 
+const console     = imports.console.console; 
 
 // make sure parent is loaded..
-TokenStream = imports.TokenStream.TokenStream;
+const TokenStream = imports.TokenStream.TokenStream;
+
 /**
  * 
  * base class for parsing segments of token array..
@@ -31,14 +32,13 @@ TokenStream = imports.TokenStream.TokenStream;
  * 
  */ 
  
-Collapse = XObject.define(
+const Collapse = XObject.define(
     function (ar)
     {
-         
         Collapse.superclass.constructor.call(this, ar);
         
         this.spaces();
-        var ar = this.collapse(this.tokens);
+        ar = this.collapse(this.tokens);
         
         this.tokens = ar;
         
@@ -257,4 +257,4 @@ Collapse = XObject.define(
 
     
     
-});
\ No newline at end of file
+});

diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js
index ca8cd0e..d5dca8a 100644 (file)
--- a/JSDOC/CompressWhite.js
+++ b/JSDOC/CompressWhite.js
@@ -8,7 +8,7 @@
    @arg packer {Packer} 
  */
  
-CompressWhite =  function (ts, packer, keepWhite)
+const CompressWhite =  function (ts, packer, keepWhite)
 {
     keepWhite = keepWhite || false;
     ts.rewind();

diff --git a/JSDOC/DocComment.js b/JSDOC/DocComment.js
index 452ce3c..42201ab 100644 (file)
--- a/JSDOC/DocComment.js
+++ b/JSDOC/DocComment.js
@@ -1,8 +1,8 @@
 //<Script type="text/javascript">
 
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
 
-DocTag = imports.DocTag.DocTag;
+const DocTag = imports.DocTag.DocTag;
 
 /**
  * Create a new DocComment. This takes a raw documentation comment,
@@ -12,7 +12,7 @@ DocTag = imports.DocTag.DocTag;
  */ 
  
 
-DocComment = XObject.define(
+const DocComment = XObject.define(
 
     function(/**String*/comment) {
         this.isUserComment = true;

diff --git a/JSDOC/Lang.js b/JSDOC/Lang.js
index ef21c06..64c9895 100644 (file)
--- a/JSDOC/Lang.js
+++ b/JSDOC/Lang.js
@@ -3,7 +3,7 @@
 /**
        @namespace
 */
-Lang = {
+const Lang = {
     
     
     isBuiltin : function(name) {
@@ -21,7 +21,7 @@ Lang = {
         " ":      "SPACE",
         "\f":     "FORMFEED",
         "\t":     "TAB",
-        "\u0009": "UNICODE_TAB",
+       // "\u0009": "UNICODE_TAB",
         "\u000A": "UNICODE_NBR",
         "\u0008": "VERTICAL_TAB"
     },
@@ -32,8 +32,8 @@ Lang = {
     newlineNames : {
         "\n":     "NEWLINE",
         "\r":     "RETURN",
-        "\u000A": "UNICODE_LF",
-        "\u000D": "UNICODE_CR",
+      //  "\u000A": "UNICODE_LF",
+      //  "\u000D": "UNICODE_CR",
         "\u2029": "UNICODE_PS",
         "\u2028": "UNICODE_LS"
     },

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index efb05c6..2b90244 100644 (file)
--- 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);

diff --git a/JSDOC/Parser.js b/JSDOC/Parser.js
index e814263..a2dcb84 100644 (file)
--- a/JSDOC/Parser.js
+++ b/JSDOC/Parser.js
@@ -1,10 +1,10 @@
 //<script type="text/javascript">
 
-Walker2      = imports.Walker2.Walker2;
-Symbol      = imports.Symbol.Symbol;
-SymbolSet      = imports.SymbolSet.SymbolSet;
-DocComment  = imports.DocComment.DocComment;
-Options     = imports.Options.Options;
+const Walker2      = imports.Walker2.Walker2;
+const Symbol      = imports.Symbol.Symbol;
+const SymbolSet      = imports.SymbolSet.SymbolSet;
+const DocComment  = imports.DocComment.DocComment;
+const Options     = imports.Options.Options;
 /**
  * Parser is a static  instance..
  * 
@@ -12,7 +12,7 @@ Options     = imports.Options.Options;
  */
  
  
-Parser = {
+const Parser = {
        conf: { 
         loaded: false 
     },

diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 2161c97..dbb3e09 100644 (file)
--- a/JSDOC/Scope.js
+++ b/JSDOC/Scope.js
@@ -6,8 +6,8 @@
 * // FIXME - I need this to do next() without doccomments..
 */
 
-Identifier = imports.Identifier.Identifier
-XObject = imports.XObject.XObject; 
+const Identifier = imports.Identifier.Identifier
+const XObject = imports.XObject.XObject; 
 
 
 function Scope(braceN, parent, startTokN, lastIdent, token)

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index aeee2ce..36a0861 100644 (file)
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -1,7 +1,7 @@
 //<Script type="text/javascript">
 
-Scope = imports.Scope.Scope;
-TokenStream = imports.TokenStream.TokenStream;
+const Scope = imports.Scope.Scope;
+const TokenStream = imports.TokenStream.TokenStream;
 /**
 * Scope stuff
 * 
@@ -11,7 +11,7 @@ TokenStream = imports.TokenStream.TokenStream;
 * 
 */
 
-ScopeParser = function(ts) {
+const ScopeParser = function(ts) {
     this.ts = ts; // {TokenStream}
     this.warnings = [];
     this.indexedg = {};
@@ -570,7 +570,7 @@ ScopeParser.prototype = {
             
         
         //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
-        while (token = this.ts.nextTok()) {
+        while ((token = this.ts.nextTok())) {
      
         
             

diff --git a/JSDOC/TextStream.js b/JSDOC/TextStream.js
index a916386..073c626 100644 (file)
--- a/JSDOC/TextStream.js
+++ b/JSDOC/TextStream.js
@@ -1,12 +1,12 @@
 //<script type="text/javscript">
 
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
 
 
 /**
        @constructor
 */
-TextStream = XObject.define(
+const TextStream = XObject.define(
     function(text) {
         if (typeof(text) == "undefined") text = "";
         text = ""+text;

diff --git a/JSDOC/Token.js b/JSDOC/Token.js
index 7c15b20..52689ba 100644 (file)
--- a/JSDOC/Token.js
+++ b/JSDOC/Token.js
@@ -1,8 +1,8 @@
 //<Script type="text/javascript">
 
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
  
-console = imports.console.console;
+const console = imports.console.console;
 /**
  *     @class Token
  * 
@@ -33,7 +33,7 @@ console = imports.console.console;
  * 
 */
 
-Token = XObject.define(
+const Token = XObject.define(
     function(data, type, name, line) {
         this.data = data;
         this.type = type;

diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js
index c38e13b..63cb7f2 100644 (file)
--- a/JSDOC/TokenReader.js
+++ b/JSDOC/TokenReader.js
@@ -1,17 +1,17 @@
 //<script type="text/javascript">
 
  
-XObject = imports.XObject.XObject;
-console = imports.console.console;
+const XObject = imports.XObject.XObject;
+const console = imports.console.console;
 
 
-Token   = imports.Token.Token;
-Lang    = imports.Lang.Lang;
+const Token   = imports.Token.Token;
+const Lang    = imports.Lang.Lang;
 
 /**
        @class Search a {@link JSDOC.TextStream} for language tokens.
 */
-TokenReader = XObject.define(
+const TokenReader = XObject.define(
     function(o) {
         
         XObject.extend(this, o || {});
@@ -52,6 +52,7 @@ TokenReader = XObject.define(
                 for (var i = tokens.length-1; i >= 0; i--) {
                     if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i];
                 }
+                return true;
             }
 
             while (!stream.look().eof) {

diff --git a/JSDOC/TokenStream.js b/JSDOC/TokenStream.js
index aee0b5a..a660873 100644 (file)
--- a/JSDOC/TokenStream.js
+++ b/JSDOC/TokenStream.js
@@ -1,13 +1,13 @@
 //<script type="text/javscript">
 
 
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
  
 
 
-console = imports.console.console;
-Token   = imports.Token.Token;
-Lang    = imports.Lang.Lang;
+const console = imports.console.console;
+const Token   = imports.Token.Token;
+const Lang    = imports.Lang.Lang;
 
 
 /**
@@ -21,7 +21,7 @@ Lang    = imports.Lang.Lang;
  */
        
  
-TokenStream = XObject.define(
+const TokenStream = XObject.define(
 
     /**
      * @constructor
@@ -217,6 +217,7 @@ TokenStream = XObject.define(
                 }
                 if (!this.next()) break;
             }
+            return false;
         },
 
         getMatchingToken : function(/**String*/start, /**String*/stop) {
@@ -240,6 +241,7 @@ TokenStream = XObject.define(
                 }
                 cursor++;
             }
+            return false;
         },
 
         insertAhead : function(/**JSDOC.Token*/token) {
@@ -278,4 +280,4 @@ TokenStream = XObject.define(
             print(out);
         }
 });
-    
\ No newline at end of file
+    

diff --git a/String.js b/String.js
index d30b494..e5e01d0 100644 (file)
--- a/String.js
+++ b/String.js
@@ -10,7 +10,8 @@
  */
 // usage:
 // Seed.include('String.js');
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
+
 
 
 XObject.extend(String, 

diff --git a/XObject.js b/XObject.js
index 05b35dc..b643375 100644 (file)
--- a/XObject.js
+++ b/XObject.js
@@ -274,6 +274,7 @@ XObject.prototype = {
                 ret = ch;
                 return true;
             }
+            return false;
         })
         if (ret) {
             return ret;
@@ -284,6 +285,7 @@ XObject.prototype = {
             if (ret) {
                 return true;
             }
+            return false;
         })
         return ret;
     }

diff --git a/pack.js b/pack.js
index c31d342..0f4a772 100644 (file)
--- a/pack.js
+++ b/pack.js
@@ -19,14 +19,14 @@
  * compresses files listed as arguments and outputs result
  */
  
-File            = imports.File.File;
-Packer          = imports.JSDOC.Packer.Packer;
+const File            = imports.File.File;
+const Packer          = imports.JSDOC.Packer.Packer;
 
 
  
   
 
-var args = Array.prototype.slice.call(Seed.argv);
+var args = Array.prototype.slice.call(typeof(Seed) != 'undefined' ? Seed.argv : ARGV);
 args.shift(); //seed
 args.shift(); // pack.js
 var cfg = {