riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #480 from Fatsie/liberty_value_expression 

Value of properties can be expression.
This commit is contained in:
Clifford Wolf 2018-01-04 13:30:00 +01:00 committed by GitHub
parent 2d140a44eb 92eb841f0a
commit fefb652d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
passes/techmap/libparse.cc
View File

@ -100,8 +100,15 @@ int LibertyParser::lexer(std::string &str)
break; break;
} }
f.unget(); f.unget();
// fprintf(stderr, "LEX: identifier >>%s<<\n", str.c_str()); if (str == "+" || str == "-") {
return 'v'; /* 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 == '"') { if (c == '"') {
@ -191,6 +198,19 @@ LibertyAst *LibertyParser::parse()
tok = lexer(ast->value); tok = lexer(ast->value);
if (tok != 'v') if (tok != 'v')
error(); 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; continue;
} }