tuxji commented on a change in pull request #471: URL: https://github.com/apache/incubator-daffodil/pull/471#discussion_r559697437
########## File path: daffodil-runtime2/src/test/resources/org/apache/daffodil/runtime2/orion-command.tdml ########## @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<tdml:testSuite + defaultConfig="config-runtime1" Review comment: I've split ex_nums_unparse.xml into ex_nums_unparse1.xml from runtime1 and ex_nums_unparse2.xml from runtime2 to illustrate the differences in XML floating point output between runtime1 and runtime2. I'll start a discussion on the dev mailing list on how to resolve these differences. One way would be to make the TDML runner use numerical comparison instead of textual comparison for floats/doubles to abstract these differences away as you suggest. Another way would be to make runtime1 and runtime2 match each other without breaking existing external or internal code/tests/usage. ########## File path: daffodil-runtime2/src/test/resources/org/apache/daffodil/runtime2/orion-command.tdml ########## @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<tdml:testSuite + defaultConfig="config-runtime1" + defaultImplementations="daffodil daffodil-runtime2" + defaultRoundTrip="onePass" + description="TDML tests for orion-command.xml" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" + xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"; + xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData";> + + <tdml:defineConfig name="config-runtime1"> + <daf:tunables> + <daf:tdmlImplementation>daffodil</daf:tdmlImplementation> + </daf:tunables> + </tdml:defineConfig> + + <tdml:defineConfig name="config-runtime2"> + <daf:tunables> + <daf:tdmlImplementation>daffodil-runtime2</daf:tdmlImplementation> + </daf:tunables> + </tdml:defineConfig> + + <tdml:parserTestCase + description="orion-command Command parse test" + model="orion-command.xml" Review comment: I'm still waiting for a reply to an email I sent our collaborator last week whether we can license orion-command.xml as Apache. I see the point about moving binary data into TDML files, On the other hand having binary data files makes it easier to debug C code generated by the C code generator (compile with -g and run under the debugger with the binary data file as a command line argument). ########## File path: daffodil-runtime2/src/main/resources/c/libruntime/parsers.h ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef PARSERS_H +#define PARSERS_H + +#include "infoset.h" // for PState +#include <stdint.h> // for uint64_t, int32_t, etc. + +// Functions to parse binary floating point numbers and integers + +extern void parse_be_double(double *number, PState *pstate); +extern void parse_be_float(float *number, PState *pstate); + +extern void parse_be_uint64(uint64_t *number, PState *pstate); +extern void parse_be_uint32(uint32_t *number, PState *pstate); +extern void parse_be_uint16(uint16_t *number, PState *pstate); +extern void parse_be_uint8(uint8_t *number, PState *pstate); + +extern void parse_be_int64(int64_t *number, PState *pstate); +extern void parse_be_int32(int32_t *number, PState *pstate); +extern void parse_be_int16(int16_t *number, PState *pstate); +extern void parse_be_int8(int8_t *number, PState *pstate); + +extern void parse_le_double(double *number, PState *pstate); +extern void parse_le_float(float *number, PState *pstate); + +extern void parse_le_uint64(uint64_t *number, PState *pstate); +extern void parse_le_uint32(uint32_t *number, PState *pstate); +extern void parse_le_uint16(uint16_t *number, PState *pstate); +extern void parse_le_uint8(uint8_t *number, PState *pstate); + +extern void parse_le_int64(int64_t *number, PState *pstate); +extern void parse_le_int32(int32_t *number, PState *pstate); +extern void parse_le_int16(int16_t *number, PState *pstate); +extern void parse_le_int8(int8_t *number, PState *pstate); + +#endif // PARSERS_H Review comment: I've added "use macros to achieve DRY (Don't Repeat Yourself)" in these files to my TODO list for my next commit. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
