added js.Module (closes #56)

neelance · neelance · commit 4ececf23df1a · 2014-06-22T23:15:51.000+02:00
diff --git a/compiler/expressions.go b/compiler/expressions.go
@@ -475,8 +475,9 @@ func (c *funcContext) translateExpr(expr ast.Expr) *expression {
 					if len(c.flattened) != 0 {
 						args = "$args"
 					}
-
 					return c.formatExpr(`new ($sliceType(%s.Object))($global.Array.prototype.slice.call(%s))`, c.p.pkgVars["github.com/gopherjs/gopherjs/js"], args)
+				case "Module":
+					return c.formatExpr("$module")
 				default:
 					panic("Invalid js package object: " + obj.Name())
 				}
diff --git a/compiler/prelude.go b/compiler/prelude.go
@@ -3,7 +3,7 @@ package compiler
 var prelude = `
 Error.stackTraceLimit = -1;
 
-var $global;
+var $global, $module;
 if (typeof window !== "undefined") { /* web page */
 	$global = window;
 } else if (typeof self !== "undefined") { /* web worker */
@@ -14,6 +14,9 @@ if (typeof window !== "undefined") { /* web page */
 } else {
 	console.log("warning: no global object found")
 }
+if (typeof module !== "undefined") {
+	$module = module;
+}
 
 var $idCounter = 0;
 var $keys = function(m) { return m ? Object.keys(m) : []; };
diff --git a/js/js.go b/js/js.go
@@ -103,6 +103,9 @@ var This Object
 // Arguments gives the value of JavaScript's "arguments" keyword. It can be used when passing Go functions to JavaScript as callbacks. Set this to a mock for testing with pure Go.
 var Arguments []Object
 
+// Module gives the value of the "module" variable set by Node.js.
+var Module Object
+
 // Returns the internal JavaScript object that represents i. Not intended for public use.
 func InternalObject(i interface{}) Object {
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,9 @@ func (c funcContext) translateExpr(expr ast.Expr) expression {`
`475`	`475`	`if len(c.flattened) != 0 {`
`476`	`476`	`args = "$args"`
`477`	`477`	`}`
`478`		`-`
`479`	`478`	return c.formatExpr(`new ($sliceType(%s.Object))($global.Array.prototype.slice.call(%s))`, c.p.pkgVars["github.com/gopherjs/gopherjs/js"], args)
	`479`	`+ case "Module":`
	`480`	`+ return c.formatExpr("$module")`
`480`	`481`	`default:`
`481`	`482`	`panic("Invalid js package object: " + obj.Name())`
`482`	`483`	`}`