Merge branch 'no-standalone-@'

Author: michaelficarra

lib/parser.js

@@ -989,15 +989,15 @@ class exports.Compiler
       ancestry.unshift this
       children = {}
 
-      for childName in @childNodes when @[childName]?
+      for childName in @childNodes when this[childName]?
         children[childName] =
           if childName in @listMembers
-            for member in @[childName]
+            for member in this[childName]
               jsNode = walk.call member, fn, inScope, ancestry
               inScope = union inScope, envEnrichments member, inScope
               jsNode
           else
-            child = @[childName]
+            child = this[childName]
             jsNode = walk.call child, fn, inScope, ancestry
             inScope = union inScope, envEnrichments child, inScope
             jsNode

src/compiler.coffee

@@ -603,12 +603,15 @@ memberExpression
       return rp(new CS.NewOp(e, args));
     }
   memberAccess
-    = e:( primaryExpression
+    = e:
+      ( primaryExpression
       / NEW __ e:memberExpression args:argumentList { return rp(new CS.NewOp(e, args.operands[0])); }
       ) accesses:(argumentList MemberAccessOps / MemberAccessOps)+ {
         var acc = foldl(function(memo, a){ return memo.concat(a); }, [], accesses);
         return createMemberExpression(e, acc);
       }
+    / contextVar
+
   MemberNames
     = identifierName
   MemberAccessOps
@@ -642,7 +645,7 @@ primaryExpression
   / null
   / undefined
   / contextVar
-  / r:(THIS / "@") { return rp(new CS.This); }
+  / r:THIS { return rp(new CS.This); }
   / identifier
   / range
   / arrayLiteral
@@ -1051,12 +1054,10 @@ unassignable = ("arguments" / "eval") !identifierPart
 CompoundAssignable
   = memberAccess
   / !unassignable i:identifier { return i; }
-  / contextVar
 ExistsAssignable = CompoundAssignable
 Assignable
   = memberAccess
   / !unassignable i:identifier { return i; }
-  / contextVar
   / positionalDestructuring
   / namedDestructuring
 

src/grammar.pegjs

@@ -103,17 +103,17 @@ envEnrichments_ = (inScope = []) ->
       nub concat [
         concatMap @childNodes, (child) =>
           if child in @listMembers
-          then concatMap @[child], (m) -> envEnrichments m, inScope
-          else envEnrichments @[child], inScope
+          then concatMap this[child], (m) -> envEnrichments m, inScope
+          else envEnrichments this[child], inScope
         beingDeclared @keyAssignee
         beingDeclared @valAssignee
       ]
     when @instanceof CS.Functions then []
     else
       nub concatMap @childNodes, (child) =>
         if child in @listMembers
-        then concatMap @[child], (m) -> envEnrichments m, inScope
-        else envEnrichments @[child], inScope
+        then concatMap this[child], (m) -> envEnrichments m, inScope
+        else envEnrichments this[child], inScope
   difference possibilities, inScope
 
 @envEnrichments = envEnrichments = (node, args...) ->

src/helpers.coffee

@@ -4,7 +4,7 @@ exports = module?.exports ? this
 createNode = (type, props) ->
   class extends Nodes
     constructor: ->
-      @[prop] = arguments[i] for prop, i in props
+      this[prop] = arguments[i] for prop, i in props
     type: type
     childNodes: props
 
@@ -20,9 +20,9 @@ createNode = (type, props) ->
     obj.leadingComments = @leadingComments if @leadingComments?
     for child in @childNodes
       if child in @listMembers
-        obj[child] = (p?.toBasicObject() for p in @[child])
+        obj[child] = (p?.toBasicObject() for p in this[child])
       else
-        obj[child] = @[child]?.toBasicObject()
+        obj[child] = this[child]?.toBasicObject()
     if @line? and @column?
       obj.loc = start: {@line, @column}
     if @offset?
@@ -100,7 +100,7 @@ handlePrimitives = (ctor, primitives) ->
   ctor::toBasicObject = ->
     obj = Nodes::toBasicObject.call this
     for primitive in primitives
-      obj[primitive] = @[primitive]
+      obj[primitive] = this[primitive]
     obj
 
 handlePrimitives AssignmentExpression, ['operator']

src/js-nodes.coffee

@@ -21,7 +21,7 @@ createNodes = (subclasses, superclasses = []) ->
         if isCategory then ->
         else ->
           for param, i in params
-            @[param] = arguments[i]
+            this[param] = arguments[i]
           if @initialise?
             @initialise.apply this, arguments
           this
@@ -222,16 +222,16 @@ Nodes::toBasicObject = ->
       ]
   for child in @childNodes
     if child in @listMembers
-      obj[child] = (p.toBasicObject() for p in @[child])
+      obj[child] = (p.toBasicObject() for p in this[child])
     else
-      obj[child] = if @[child]? then @[child].toBasicObject()
+      obj[child] = if this[child]? then this[child].toBasicObject()
   obj
 Nodes::fold = (memo, fn) ->
   for child in @childNodes
     if child in @listMembers
-      memo = (p.fold memo, fn for p in @[child])
+      memo = (p.fold memo, fn for p in this[child])
     else
-      memo = @[child].fold memo, fn
+      memo = this[child].fold memo, fn
   fn memo, this
 Nodes::clone = ->
   ctor = ->
@@ -260,7 +260,7 @@ handlePrimitives = (ctor, primitives...) ->
   ctor::toBasicObject = ->
     obj = Nodes::toBasicObject.call this
     for primitive in primitives
-      obj[primitive] = @[primitive]
+      obj[primitive] = this[primitive]
     obj
 
 handlePrimitives Class, 'boundMembers'

src/nodes.coffee

@@ -141,8 +141,8 @@ mayHaveSideEffects =
   ], (inScope) ->
     any @childNodes, (child) =>
       if child in @listMembers
-      then any @[child], (m) -> mayHaveSideEffects m, inScope
-      else mayHaveSideEffects @[child], inScope
+      then any this[child], (m) -> mayHaveSideEffects m, inScope
+      else mayHaveSideEffects this[child], inScope
 
 
 
@@ -355,19 +355,19 @@ class exports.Optimiser
 
     walk = (fn, inScope = [], ancestry = []) ->
       ancestry.unshift this
-      for childName in @childNodes when @[childName]?
+      for childName in @childNodes when this[childName]?
         if childName in @listMembers
-          for member, n in @[childName]
-            while @[childName][n] isnt walk.call (@[childName][n] = fn.call @[childName][n], {inScope, ancestry}), fn, inScope, ancestry then
-            inScope = union inScope, envEnrichments @[childName][n], inScope
+          for member, n in this[childName]
+            while this[childName][n] isnt walk.call (this[childName][n] = fn.call this[childName][n], {inScope, ancestry}), fn, inScope, ancestry then
+            inScope = union inScope, envEnrichments this[childName][n], inScope
         else
-          while @[childName] isnt walk.call (@[childName] = fn.call @[childName], {inScope, ancestry}), fn, inScope, ancestry then
-          inScope = union inScope, envEnrichments @[childName], inScope
+          while this[childName] isnt walk.call (this[childName] = fn.call this[childName], {inScope, ancestry}), fn, inScope, ancestry then
+          inScope = union inScope, envEnrichments this[childName], inScope
       do ancestry.shift
       replacementNode = fn.call this, {inScope, ancestry}
       if this isnt replacementNode
         while replacementNode isnt walk.call (replacementNode = fn.call replacementNode, {inScope, ancestry}), fn, inScope, ancestry then
-        replacementNode[p] = @[p] for p in ['raw', 'line', 'column', 'offset']
+        replacementNode[p] = this[p] for p in ['raw', 'line', 'column', 'offset']
       replacementNode
 
     (ast) ->

src/optimiser.coffee

@@ -165,11 +165,11 @@ suite 'Classes', ->
 
       class Base
         @attr = (name) ->
-          @::[name] = (val) ->
+          this::[name] = (val) ->
             if arguments.length > 0
-              @["_#{name}"] = val
+              this["_#{name}"] = val
             else
-              @["_#{name}"]
+              this["_#{name}"]
 
       class Robot extends Base
         @attr 'power'
@@ -406,7 +406,7 @@ suite 'Classes', ->
 
       class ClassName
         amI: ->
-          @ instanceof ClassName
+          this instanceof ClassName
 
       obj = new ClassName
       ok obj.amI()