From: Staf Verhaegen <staf@stafverhaegen.be>
Date: Wed, 3 Jan 2018 20:36:22 +0000 (+0000)
Subject: Value of properties can be expression.
X-Git-Tag: yosys-0.8~239^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92eb841f0a506ce776d511ec443769f5bcc2961f;p=yosys.git

Value of properties can be expression.

Example found in the 2007.03 Liberty Reference Manual that was also found
in the wild:

    input_voltage(CMOS) {
        vil : 0.3 * VDD ;
        vih : 0.7 * VDD ;
        vimin : -0.5 ;
        vimax : VDD + 0.5 ;
    }

Current implementation just parses the expression but no interpretation is done.
---

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index d5254c029..d3b1ff02f 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -100,8 +100,15 @@ int LibertyParser::lexer(std::string &str)
 				break;
 		}
 		f.unget();
-		// fprintf(stderr, "LEX: identifier >>%s<<\n", str.c_str());
-		return 'v';
+		if (str == "+" || str == "-") {
+			/* Single operator is not an identifier */
+			// fprintf(stderr, "LEX: char >>%s<<\n", str.c_str());
+			return str[0];
+		}
+		else {
+			// fprintf(stderr, "LEX: identifier >>%s<<\n", str.c_str());
+			return 'v';
+		}
 	}
 
 	if (c == '"') {
@@ -191,6 +198,19 @@ LibertyAst *LibertyParser::parse()
 			tok = lexer(ast->value);
 			if (tok != 'v')
 				error();
+			tok = lexer(str);
+			while (tok == '+' || tok == '-' || tok == '*' || tok == '/') {
+				ast->value += tok;
+				tok = lexer(str);
+				if (tok != 'v')
+					error();
+				ast->value += str;
+				tok = lexer(str);
+			}
+			if (tok == ';')
+				break;
+			else
+				error();
 			continue;
 		}