BaseTools: Report more clear error message for PCD used in expression

Only the FeatureFlag type or FixedAtBuild type can be used in the
expression.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 78c69faad626451545a1148a9a73d25a9f3fcdda..ff9271031b0e3351e441fdd4ff195212e1b64dd2 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -29,7 +29,7 @@ ERR_MATCH               = 'No matching right parenthesis.'
 ERR_STRING_TOKEN        = 'Bad string token: [%s].'\r
 ERR_MACRO_TOKEN         = 'Bad macro token: [%s].'\r
 ERR_EMPTY_TOKEN         = 'Empty token is not allowed.'\r
-ERR_PCD_RESOLVE         = 'PCD token cannot be resolved: [%s].'\r
+ERR_PCD_RESOLVE         = 'The PCD should be FeatureFlag type or FixedAtBuild type: [%s].'\r
 ERR_VALID_TOKEN         = 'No more valid token found from rest of string: [%s].'\r
 ERR_EXPR_TYPE           = 'Different types found in expression.'\r
 ERR_OPERATOR_UNSUPPORT  = 'Unsupported operator: [%s]'\r

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 20581edadf3f5c9c14a1abe113bd1e309a1d614f..407dc06ccf0b598b03a9a25bf6f80114364a13d5 100644 (file)
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -26,7 +26,7 @@ ERR_MATCH = 'No matching right parenthesis.'
 ERR_STRING_TOKEN = 'Bad string token: [%s].'\r
 ERR_MACRO_TOKEN = 'Bad macro token: [%s].'\r
 ERR_EMPTY_TOKEN = 'Empty token is not allowed.'\r
-ERR_PCD_RESOLVE = 'PCD token cannot be resolved: [%s].'\r
+ERR_PCD_RESOLVE = 'The PCD should be FeatureFlag type or FixedAtBuild type: [%s].'\r
 ERR_VALID_TOKEN = 'No more valid token found from rest of string: [%s].'\r
 ERR_EXPR_TYPE = 'Different types found in expression.'\r
 ERR_OPERATOR_UNSUPPORT = 'Unsupported operator: [%s]'\r