Changeset 50eac1b for src/Parser/lex.ll

Timestamp:

Nov 18, 2015, 12:50:35 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

84b08d4, ba407ce

Parents:

f28a53a (diff), 9909842 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into override-autogen

File:

• src/Parser/lex.ll (modified) (2 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Mon Sep 28 17:07:48 2015
- * Update Count     : 402
+ * Last Modified On : Thu Oct  8 16:13:07 2015
+ * Update Count     : 404
  */
 
@@ -356 +356 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
+"@="                    { NAMEDOP_RETURN(ATassign); }
+
                                 /* CFA, operator identifier */
 {op_unary}"?"   { IDENTIFIER_RETURN(); }                                // unary