[master] 929254c Polish

[Federico G. Schwindt]

commit 929254c7f901cf5fc696f639f8252fd3aebf04aa
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Feb 13 12:55:07 2017 +0000

    Polish

diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index ce6395d..5ec79cc 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -1002,22 +1002,21 @@ static const struct adds {
 	vcc_type_t	b;
 	vcc_type_t	fmt;
 } vcc_adds[] = {
-	/* OK */
-	{ '-', TIME,		TIME,		DURATION },
-	{ '+', TIME,		DURATION,	TIME },
-	{ '-', TIME,		DURATION,	TIME },
-	{ '+', DURATION,	DURATION,	DURATION },
-	{ '-', DURATION,	DURATION,	DURATION },
 	{ '+', BYTES,		BYTES,		BYTES },
 	{ '-', BYTES,		BYTES,		BYTES },
+	{ '+', DURATION,	DURATION,	DURATION },
+	{ '-', DURATION,	DURATION,	DURATION },
 	{ '+', INT,		INT,		INT },
 	{ '-', INT,		INT,		INT },
-	{ '+', REAL,		REAL,		REAL },
-	{ '-', REAL,		REAL,		REAL },
-	{ '+', REAL,		INT,		REAL },
-	{ '-', REAL,		INT,		REAL },
 	{ '+', INT,		REAL,		REAL },
 	{ '-', INT,		REAL,		REAL },
+	{ '+', REAL,		INT,		REAL },
+	{ '-', REAL,		INT,		REAL },
+	{ '+', REAL,		REAL,		REAL },
+	{ '-', REAL,		REAL,		REAL },
+	{ '-', TIME,		TIME,		DURATION },
+	{ '+', TIME,		DURATION,	TIME },
+	{ '-', TIME,		DURATION,	TIME },
 
 	{ EOI, VOID, VOID, VOID }
 };
@@ -1053,10 +1052,7 @@ vcc_expr_add(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 	while (tl->t->tok == '+' || tl->t->tok == '-') {
 		tk = tl->t;
 		vcc_NextToken(tl);
-		if (f2 == TIME)
-			vcc_expr_mul(tl, &e2, DURATION);
-		else
-			vcc_expr_mul(tl, &e2, f2);
+		vcc_expr_mul(tl, &e2, f2);
 		ERRCHK(tl);
 
 		for (ap = vcc_adds; ap->op != EOI; ap++) {