Merge branch 'master' of https://github.com/vladfolts/oberonjs

.gitignore

@@ -1,4 +1,5 @@
 _out/
+test/output/
 
 #################
 ## Eclipse

src/context.js

@@ -1619,11 +1619,13 @@ function genExports(exports, gen){
         var e = exports[access];
         if (e.isVariable())
             access = "function(){return " + access + ";}";
-        result += "\t" + e.id() + ": " + access + "\n";
+        if (result.length)
+            result += ",\n";
+        result += "\t" + e.id() + ": " + access;
     }
     if (!result.length)
         return;
-    gen.write("return {\n" + result + "}\n");
+    gen.write("return {\n" + result + "\n}\n");
 }
 
 exports.ModuleDeclaration = ChainedContext.extend({

test/expected/export.js

@@ -42,11 +42,11 @@ var vi = 0;
 function p1(){
 }
 return {
-	ci: ci
-	T1: T1
-	pr1: function(){return pr1;}
-	p2: function(){return p2;}
-	vi: function(){return vi;}
+	ci: ci,
+	T1: T1,
+	pr1: function(){return pr1;},
+	p2: function(){return p2;},
+	vi: function(){return vi;},
 	p1: p1
 }
 }();

test/expected/modules.js

@@ -29,9 +29,9 @@ function p(){
 }
 pr = new anonymous$1$base();
 return {
-	ci: ci
-	i: function(){return i;}
-	pr: function(){return pr;}
+	ci: ci,
+	i: function(){return i;},
+	pr: function(){return pr;},
 	p: p
 }
 }();

test/test_compile.js

@@ -6,7 +6,8 @@ var path = require("path");
 var Test = require("test.js");
 
 function normalizeLineEndings(text){
-    return text.replace(/\r\n/g, '\n');
+    return text.replace(/\r\n/g, '\n')
+               .replace(/\s+$/,''); // ending spaces
 }
 
 function compareResults(result, name, dirs){