fixing standalone @ references

lib/lexer.js

@@ -127,7 +127,7 @@
       }
     }
     tag = 'IDENTIFIER';
-    if (KEYWORDS.indexOf(id) >= 0 && !(ACCESSORS.indexOf(this.tag()) >= 0)) {
+    if (KEYWORDS.indexOf(id) >= 0 && !((ACCESSORS.indexOf(this.tag()) >= 0) && !this.prev().spaced)) {
       tag = id.toUpperCase();
     }
     if (RESERVED.indexOf(id) >= 0) {
@@ -220,7 +220,7 @@
     this.line += indent.match(MULTILINER).length;
     this.i += indent.length;
     next_character = this.chunk.match(MULTI_DENT)[4];
-    prev = this.tokens[this.tokens.length - 2];
+    prev = this.prev(2);
     no_newlines = next_character === '.' || (this.value() && this.value().match(NO_NEWLINE) && prev && (prev[0] !== '.') && !this.value().match(CODE));
     if (no_newlines) {
       return this.suppress_newlines(indent);
@@ -259,7 +259,7 @@
     if (!((space = this.match(WHITESPACE, 1)))) {
       return false;
     }
-    prev = this.tokens[this.tokens.length - 1];
+    prev = this.prev();
     if (prev) {
       prev.spaced = true;
     }
@@ -285,7 +285,7 @@
   // Multi-character operators are also literal tokens, so that Racc can assign
   // the proper order of operations.
   lex.prototype.literal_token = function literal_token() {
-    var match, prev, tag, value;
+    var match, tag, value;
     match = this.chunk.match(OPERATOR);
     value = match && match[1];
     if (value && value.match(CODE)) {
@@ -302,8 +302,7 @@
     if (value === ';') {
       tag = 'TERMINATOR';
     }
-    prev = this.tokens[this.tokens.length - 1];
+    if (CALLABLE.indexOf(this.tag()) >= 0 && (!this.prev() || !this.prev().spaced)) {
-    if (CALLABLE.indexOf(this.tag()) >= 0 && (!prev || !prev.spaced)) {
       if (value === '(') {
         tag = 'CALL_START';
       }
@@ -323,7 +322,7 @@
   // Look at a tag in the current token stream.
   lex.prototype.tag = function tag(index, tag) {
     var tok;
-    if (!((tok = this.tokens[this.tokens.length - (index || 1)]))) {
+    if (!((tok = this.prev(index)))) {
       return null;
     }
     if ((typeof tag !== "undefined" && tag !== null)) {
@@ -334,7 +333,7 @@
   // Look at a value in the current token stream.
   lex.prototype.value = function value(index, val) {
     var tok;
-    if (!((tok = this.tokens[this.tokens.length - (index || 1)]))) {
+    if (!((tok = this.prev(index)))) {
       return null;
     }
     if ((typeof val !== "undefined" && val !== null)) {
@@ -342,6 +341,10 @@
     }
     return tok[1];
   };
+  // Look at a previous token.
+  lex.prototype.prev = function prev(index) {
+    return this.tokens[this.tokens.length - (index || 1)];
+  };
   // Count the occurences of a character in a string.
   lex.prototype.count = function count(string, letter) {
     var num, pos;
@@ -374,7 +377,7 @@
     i = 0;
     while (true) {
       i += 1;
-      tok = this.tokens[this.tokens.length - i];
+      tok = this.prev(i);
       if (!tok) {
         return null;
       }

src/lexer.coffee

@@ -128,7 +128,8 @@ lex::identifier_token: ->
     else
       @tag(1, 'PROPERTY_ACCESS')
   tag: 'IDENTIFIER'
-  tag:  id.toUpperCase() if KEYWORDS.indexOf(id) >= 0 and not (ACCESSORS.indexOf(@tag()) >= 0)
+  tag:  id.toUpperCase() if KEYWORDS.indexOf(id) >= 0 and
+    not ((ACCESSORS.indexOf(@tag()) >= 0) and not @prev().spaced)
   throw new Error('SyntaxError: Reserved word "' + id + '" on line ' + @line) if RESERVED.indexOf(id) >= 0
   tag: 'LEADING_WHEN' if tag is 'WHEN' and BEFORE_WHEN.indexOf(@tag()) >= 0
   @token(tag, id)
@@ -194,7 +195,7 @@ lex::indent_token: ->
   @line += indent.match(MULTILINER).length
   @i    += indent.length
   next_character: @chunk.match(MULTI_DENT)[4]
-  prev: @tokens[@tokens.length - 2]
+  prev: @prev(2)
   no_newlines: next_character is '.' or (@value() and @value().match(NO_NEWLINE) and prev and (prev[0] isnt '.') and not @value().match(CODE))
   return @suppress_newlines(indent) if no_newlines
   size: indent.match(LAST_DENTS).reverse()[0].match(LAST_DENT)[1].length
@@ -221,7 +222,7 @@ lex::outdent_token: (move_out) ->
 # Matches and consumes non-meaningful whitespace.
 lex::whitespace_token: ->
   return false unless space: @match WHITESPACE, 1
-  prev: @tokens[@tokens.length - 1]
+  prev: @prev()
   prev.spaced: true if prev
   @i += space.length
   true
@@ -251,8 +252,7 @@ lex::literal_token: ->
     throw new Error('SyntaxError: Reserved word "' + @value() + '" on line ' + @line + ' can\'t be assigned') if JS_FORBIDDEN.indexOf(@value()) >= 0
   tag: 'TERMINATOR' if value == ';'
 
-  prev: @tokens[@tokens.length - 1]
+  if CALLABLE.indexOf(@tag()) >= 0 and (not @prev() or not @prev().spaced)
-  if CALLABLE.indexOf(@tag()) >= 0 and (not prev or not prev.spaced)
     tag: 'CALL_START'  if value is '('
     tag: 'INDEX_START' if value is '['
   @token tag, value
@@ -267,16 +267,20 @@ lex::token: (tag, value) ->
 
 # Look at a tag in the current token stream.
 lex::tag: (index, tag) ->
-  return unless tok: @tokens[@tokens.length - (index or 1)]
+  return unless tok: @prev(index)
   return tok[0]: tag if tag?
   tok[0]
 
 # Look at a value in the current token stream.
 lex::value: (index, val) ->
-  return unless tok: @tokens[@tokens.length - (index or 1)]
+  return unless tok: @prev(index)
   return tok[1]: val if val?
   tok[1]
 
+# Look at a previous token.
+lex::prev: (index) ->
+  @tokens[@tokens.length - (index or 1)]
+
 # Count the occurences of a character in a string.
 lex::count: (string, letter) ->
   num: 0
@@ -301,7 +305,7 @@ lex::tag_parameters: ->
   i: 0
   while true
     i += 1
-    tok: @tokens[@tokens.length - i]
+    tok: @prev(i)
     return if not tok
     switch tok[0]
       when 'IDENTIFIER' then tok[0]: 'PARAM'