From 32c40d37c02694326abfd784010fc4c328764251 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <ajt@highfidelity.io>
Date: Sun, 1 Nov 2015 16:01:29 -0800
Subject: [PATCH] Removed vec literals tokens and renamed int and float token
 types

---
 libraries/animation/src/AnimExpression.h | 11 ++++-------
 tests/animation/src/AnimTests.cpp        |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libraries/animation/src/AnimExpression.h b/libraries/animation/src/AnimExpression.h
index 7e6c42f08a..7ba099ce2e 100644
--- a/libraries/animation/src/AnimExpression.h
+++ b/libraries/animation/src/AnimExpression.h
@@ -25,11 +25,8 @@ protected:
         enum Type {
             End = 0,
             Identifier,
-            LiteralInt,
-            LiteralFloat,
-            LiteralVec3,
-            LiteralVec4,
-            LiteralQuat,
+            Int,
+            Float,
             And,
             Or,
             GreaterThan,
@@ -50,8 +47,8 @@ protected:
         };
         Token(Type type) : type(type) {}
         Token(const QStringRef& strRef) : type(Type::Identifier), strVal(strRef.toString()) {}
-        Token(int val) : type(Type::LiteralInt), intVal(val) {}
-        Token(float val) : type(Type::LiteralFloat), floatVal(val) {}
+        Token(int val) : type(Type::Int), intVal(val) {}
+        Token(float val) : type(Type::Float), floatVal(val) {}
         Type type = End;
         QString strVal;
         int intVal;
diff --git a/tests/animation/src/AnimTests.cpp b/tests/animation/src/AnimTests.cpp
index 5b6806ec09..44f9c05c22 100644
--- a/tests/animation/src/AnimTests.cpp
+++ b/tests/animation/src/AnimTests.cpp
@@ -331,7 +331,7 @@ void AnimTests::testTokenizer() {
     AnimExpression::Token token = e.consumeToken(str, iter);
     QVERIFY(token.type == AnimExpression::Token::LeftParen);
     token = e.consumeToken(str, iter);
-    QVERIFY(token.type == AnimExpression::Token::LiteralInt);
+    QVERIFY(token.type == AnimExpression::Token::Int);
     QVERIFY(token.intVal == 10);
     token = e.consumeToken(str, iter);
     QVERIFY(token.type == AnimExpression::Token::Plus);
@@ -343,7 +343,7 @@ void AnimTests::testTokenizer() {
     token = e.consumeToken(str, iter);
     QVERIFY(token.type == AnimExpression::Token::GreaterThanEqual);
     token = e.consumeToken(str, iter);
-    QVERIFY(token.type == AnimExpression::Token::LiteralFloat);
+    QVERIFY(token.type == AnimExpression::Token::Float);
     QVERIFY(fabsf(token.floatVal - 20.1f) < 0.0001f);
     token = e.consumeToken(str, iter);
     QVERIFY(token.type == AnimExpression::Token::And);