Changes for reading ADL AOM JSON Files #569
Conversation
Merge from openEHR
rename standard type name EXPR_LITERAL to EXPR_LEAF; add C_STRING as valid Expression Type; enable Enum case insensitive mapping; allow single number Multiplicity Intervals; add test cases for S2 AOM JSON
David-N-Perkins
changed the title
rename Expression Type C_STRING string representation to CString
| @@ -5,7 +5,7 @@ | |||
| * Created by pieter.bos on 27/10/15. | |||
| */ | |||
| public enum ExpressionType { | |||
| BOOLEAN, STRING, INTEGER, REAL, DATE, TIME, DATETIME, DURATION; | |||
| BOOLEAN, STRING, INTEGER, REAL, DATE, TIME, DATETIME, DURATION, C_STRING; | |||
There was a problem hiding this comment.
I am not sure if C_STRING should be added here. Expression type is used as the result of an expression when evaluating.
I cannot think of an expression with result type C_STRING. Would that not be a boolean, whether it matches or not?
is there a reason in particular why this type would be needed here?
There was a problem hiding this comment.
This is the type of the ARCHETYPE_ID_CONSTRAINT atom, used with the matches operator. In general there can be a subtree whose construction is:
op = matches; type = Boolean
opd_left = /path/to/some/value; type = <some primitive type>
opd_right = C_XXX constraint object; type = <constraint for primitive type>
So for the specific case of matching archetype id, it is
op = matches; type = Boolean
opd_left = /archetype_id/value ; type = String
opd_right = C_STRING regex to match archetype id; constraint object; type = C_STRING
As far as we can tell, the enum needs to have C_STRING in it, because without it, it doesn't allow any operand (or other node) to be a C_STRING. Most likely, all the C_XXX primitive types should be there, but we don't use them, so for now at least it won't matter. But the matches operator always has a sub-tree of the first form above, with a constraint matcher node on the right hand side.
There was a problem hiding this comment.
I guess that's correct - I guess we just don't always fill this. But then you also need all the other C_-types that can be expressed in the rules, at least C_TERMINOLOGY_CODE and C_BOOLEAN. Should not block these changes of course.
| @@ -5,7 +5,7 @@ | |||
| * Created by pieter.bos on 27/10/15. | |||
| */ | |||
| public enum ExpressionType { | |||
| BOOLEAN, STRING, INTEGER, REAL, DATE, TIME, DATETIME, DURATION; | |||
| BOOLEAN, STRING, INTEGER, REAL, DATE, TIME, DATETIME, DURATION, C_STRING; | |||
There was a problem hiding this comment.
I guess that's correct - I guess we just don't always fill this. But then you also need all the other C_-types that can be expressed in the rules, at least C_TERMINOLOGY_CODE and C_BOOLEAN. Should not block these changes of course.
These changes were made to enable parsing of AOM JSON files created by the ADL Workbench.
They include:
EXPR_LITERALtoEXPR_LEAFC_STRINGto the Expression Type enum