diff --git a/xo-alloc2/idl/ResourceVisitor.json5 b/xo-alloc2/idl/ResourceVisitor.json5 index 79c9d81b..54effc41 100644 --- a/xo-alloc2/idl/ResourceVisitor.json5 +++ b/xo-alloc2/idl/ResourceVisitor.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/alloc2", + output_hpp_dir: "include/xo/alloc2", + output_impl_subdir: "visitor", includes: [ "\"Allocator.hpp\"" ], diff --git a/xo-expression2/idl/Expression.json5 b/xo-expression2/idl/Expression.json5 index 5391e89a..66c60def 100644 --- a/xo-expression2/idl/Expression.json5 +++ b/xo-expression2/idl/Expression.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"TypeRef.hpp\"", "\"exprtype.hpp\"", ""], diff --git a/xo-expression2/idl/IExpression_DApplyExpr.json5 b/xo-expression2/idl/IExpression_DApplyExpr.json5 index 353a7147..29762364 100644 --- a/xo-expression2/idl/IExpression_DApplyExpr.json5 +++ b/xo-expression2/idl/IExpression_DApplyExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DConstant.json5 b/xo-expression2/idl/IExpression_DConstant.json5 index 3e491f2b..bbbcc402 100644 --- a/xo-expression2/idl/IExpression_DConstant.json5 +++ b/xo-expression2/idl/IExpression_DConstant.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DDefineExpr.json5 b/xo-expression2/idl/IExpression_DDefineExpr.json5 index 28940c7b..8fd6149f 100644 --- a/xo-expression2/idl/IExpression_DDefineExpr.json5 +++ b/xo-expression2/idl/IExpression_DDefineExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DIfElseExpr.json5 b/xo-expression2/idl/IExpression_DIfElseExpr.json5 index 39c6cd70..431fd60a 100644 --- a/xo-expression2/idl/IExpression_DIfElseExpr.json5 +++ b/xo-expression2/idl/IExpression_DIfElseExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DLambdaExpr.json5 b/xo-expression2/idl/IExpression_DLambdaExpr.json5 index 675d6d9f..36aa9bb4 100644 --- a/xo-expression2/idl/IExpression_DLambdaExpr.json5 +++ b/xo-expression2/idl/IExpression_DLambdaExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DSequenceExpr.json5 b/xo-expression2/idl/IExpression_DSequenceExpr.json5 index 5c5f1b9a..71b13aba 100644 --- a/xo-expression2/idl/IExpression_DSequenceExpr.json5 +++ b/xo-expression2/idl/IExpression_DSequenceExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DVarRef.json5 b/xo-expression2/idl/IExpression_DVarRef.json5 index 89ee50d8..7b50c7fb 100644 --- a/xo-expression2/idl/IExpression_DVarRef.json5 +++ b/xo-expression2/idl/IExpression_DVarRef.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DVariable.json5 b/xo-expression2/idl/IExpression_DVariable.json5 index f22f7d4b..c68a9609 100644 --- a/xo-expression2/idl/IExpression_DVariable.json5 +++ b/xo-expression2/idl/IExpression_DVariable.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IGCObject_DApplyExpr.json5 b/xo-expression2/idl/IGCObject_DApplyExpr.json5 index 9946116a..60f997c8 100644 --- a/xo-expression2/idl/IGCObject_DApplyExpr.json5 +++ b/xo-expression2/idl/IGCObject_DApplyExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DConstant.json5 b/xo-expression2/idl/IGCObject_DConstant.json5 index 1c97456e..961f39bb 100644 --- a/xo-expression2/idl/IGCObject_DConstant.json5 +++ b/xo-expression2/idl/IGCObject_DConstant.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DGlobalSymtab.json5 b/xo-expression2/idl/IGCObject_DGlobalSymtab.json5 index dac8ebac..ac779ec2 100644 --- a/xo-expression2/idl/IGCObject_DGlobalSymtab.json5 +++ b/xo-expression2/idl/IGCObject_DGlobalSymtab.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DIfElseExpr.json5 b/xo-expression2/idl/IGCObject_DIfElseExpr.json5 index 751c0b9f..6fb8c07a 100644 --- a/xo-expression2/idl/IGCObject_DIfElseExpr.json5 +++ b/xo-expression2/idl/IGCObject_DIfElseExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DLambdaExpr.json5 b/xo-expression2/idl/IGCObject_DLambdaExpr.json5 index 506feb48..a0f494ff 100644 --- a/xo-expression2/idl/IGCObject_DLambdaExpr.json5 +++ b/xo-expression2/idl/IGCObject_DLambdaExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DLocalSymtab.json5 b/xo-expression2/idl/IGCObject_DLocalSymtab.json5 index ca815ee0..ec8260a0 100644 --- a/xo-expression2/idl/IGCObject_DLocalSymtab.json5 +++ b/xo-expression2/idl/IGCObject_DLocalSymtab.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DSequenceExpr.json5 b/xo-expression2/idl/IGCObject_DSequenceExpr.json5 index c3bd7458..1fc67e48 100644 --- a/xo-expression2/idl/IGCObject_DSequenceExpr.json5 +++ b/xo-expression2/idl/IGCObject_DSequenceExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DUniqueString.json5 b/xo-expression2/idl/IGCObject_DUniqueString.json5 index cb16d6a2..4f79e9de 100644 --- a/xo-expression2/idl/IGCObject_DUniqueString.json5 +++ b/xo-expression2/idl/IGCObject_DUniqueString.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DVarRef.json5 b/xo-expression2/idl/IGCObject_DVarRef.json5 index 1a46f47e..6c1bad33 100644 --- a/xo-expression2/idl/IGCObject_DVarRef.json5 +++ b/xo-expression2/idl/IGCObject_DVarRef.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DVariable.json5 b/xo-expression2/idl/IGCObject_DVariable.json5 index 84a47d01..6bea1dc3 100644 --- a/xo-expression2/idl/IGCObject_DVariable.json5 +++ b/xo-expression2/idl/IGCObject_DVariable.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-expression2/idl/IPrintable_DApplyExpr.json5 b/xo-expression2/idl/IPrintable_DApplyExpr.json5 index 88a3fef7..f9d3f17d 100644 --- a/xo-expression2/idl/IPrintable_DApplyExpr.json5 +++ b/xo-expression2/idl/IPrintable_DApplyExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DConstant.json5 b/xo-expression2/idl/IPrintable_DConstant.json5 index 9e4e1ad0..ca9d7948 100644 --- a/xo-expression2/idl/IPrintable_DConstant.json5 +++ b/xo-expression2/idl/IPrintable_DConstant.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DDefineExpr.json5 b/xo-expression2/idl/IPrintable_DDefineExpr.json5 index 89c2fdff..c706817d 100644 --- a/xo-expression2/idl/IPrintable_DDefineExpr.json5 +++ b/xo-expression2/idl/IPrintable_DDefineExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DGlobalSymtab.json5 b/xo-expression2/idl/IPrintable_DGlobalSymtab.json5 index 151f8a90..d0242e8c 100644 --- a/xo-expression2/idl/IPrintable_DGlobalSymtab.json5 +++ b/xo-expression2/idl/IPrintable_DGlobalSymtab.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DIfElseExpr.json5 b/xo-expression2/idl/IPrintable_DIfElseExpr.json5 index 90f02307..208e7b06 100644 --- a/xo-expression2/idl/IPrintable_DIfElseExpr.json5 +++ b/xo-expression2/idl/IPrintable_DIfElseExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DLambdaExpr.json5 b/xo-expression2/idl/IPrintable_DLambdaExpr.json5 index 60e0397e..89b07d1c 100644 --- a/xo-expression2/idl/IPrintable_DLambdaExpr.json5 +++ b/xo-expression2/idl/IPrintable_DLambdaExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DLocalSymtab.json5 b/xo-expression2/idl/IPrintable_DLocalSymtab.json5 index 5d48e5f4..15087c3d 100644 --- a/xo-expression2/idl/IPrintable_DLocalSymtab.json5 +++ b/xo-expression2/idl/IPrintable_DLocalSymtab.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DSequenceExpr.json5 b/xo-expression2/idl/IPrintable_DSequenceExpr.json5 index 1b45094f..0cfe76c9 100644 --- a/xo-expression2/idl/IPrintable_DSequenceExpr.json5 +++ b/xo-expression2/idl/IPrintable_DSequenceExpr.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DUniqueString.json5 b/xo-expression2/idl/IPrintable_DUniqueString.json5 index d640ce9c..ba094879 100644 --- a/xo-expression2/idl/IPrintable_DUniqueString.json5 +++ b/xo-expression2/idl/IPrintable_DUniqueString.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DVarRef.json5 b/xo-expression2/idl/IPrintable_DVarRef.json5 index 0d73c1d9..106b41d1 100644 --- a/xo-expression2/idl/IPrintable_DVarRef.json5 +++ b/xo-expression2/idl/IPrintable_DVarRef.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DVariable.json5 b/xo-expression2/idl/IPrintable_DVariable.json5 index 8e88cde0..779afd25 100644 --- a/xo-expression2/idl/IPrintable_DVariable.json5 +++ b/xo-expression2/idl/IPrintable_DVariable.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/ISymbolTable_DGlobalSymtab.json5 b/xo-expression2/idl/ISymbolTable_DGlobalSymtab.json5 index 8cc1035b..ff148a2f 100644 --- a/xo-expression2/idl/ISymbolTable_DGlobalSymtab.json5 +++ b/xo-expression2/idl/ISymbolTable_DGlobalSymtab.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 b/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 index ff46c622..7cfcd75f 100644 --- a/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 +++ b/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/SymbolTable.json5 b/xo-expression2/idl/SymbolTable.json5 index 9cd6e45b..b299bfe7 100644 --- a/xo-expression2/idl/SymbolTable.json5 +++ b/xo-expression2/idl/SymbolTable.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "symtab", includes: [ "\"Binding.hpp\"", "\"DUniqueString.hpp\"" diff --git a/xo-facet/codegen/genfacet b/xo-facet/codegen/genfacet index 062683be..6b2c6069 100755 --- a/xo-facet/codegen/genfacet +++ b/xo-facet/codegen/genfacet @@ -455,9 +455,6 @@ def main(): parser.add_argument('--input', required=True, help='input IDL JSON5 file') # --facet-dir: only with mode=implementation parser.add_argument('--facet-dir', required=False, help='base dir for facet json') - # --output-impl-hpp: putting this in .json5, will be able to drop this. - parser.add_argument('--output-impl-hpp', required=True, help='.hpp detail subdir') - parser.add_argument('--output-hpp', required=True, help='.hpp output directory') parser.add_argument('--output-cpp', required=False, help='.cpp output directory') args = parser.parse_args() @@ -465,12 +462,23 @@ def main(): idl_fname = args.input idl = load_idl(idl_fname) - output_hpp_dir = Path(args.output_hpp) + # output_hpp_dir: prefer IDL, fall back to CLI + if 'output_hpp_dir' in idl: + output_hpp_dir = Path(idl['output_hpp_dir']) + elif args.output_hpp: + output_hpp_dir = Path(args.output_hpp) + else: + parser.error("--output-hpp required when .json5 lacks output_hpp_dir") output_hpp_dir.mkdir(parents=False, exist_ok=True) - # TODO: output_impl_hpp_subdir: use idl['detail_subdir'] instead - output_impl_hpp_subdir = Path(args.output_impl_hpp) - output_impl_hpp_dir = Path(args.output_hpp) / output_impl_hpp_subdir + # output_impl_hpp_subdir: prefer IDL, fall back to CLI + if 'output_impl_subdir' in idl: + output_impl_hpp_subdir = Path(idl['output_impl_subdir']) + elif args.output_impl_hpp: + output_impl_hpp_subdir = Path(args.output_impl_hpp) + else: + parser.error("--output-impl-hpp required when .json5 lacks output_impl_subdir") + output_impl_hpp_dir = output_hpp_dir / output_impl_hpp_subdir output_impl_hpp_dir.mkdir(parents=False, exist_ok=True) if 'output_cpp_dir' in idl: diff --git a/xo-gc/idl/GCObject.json5 b/xo-gc/idl/GCObject.json5 index 242bea1e..7056f0b8 100644 --- a/xo-gc/idl/GCObject.json5 +++ b/xo-gc/idl/GCObject.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/gc", + output_hpp_dir: "include/xo/gc", + output_impl_subdir: "detail", includes: [ "", "", diff --git a/xo-interpreter2/idl/IGCObject_DClosure.json5 b/xo-interpreter2/idl/IGCObject_DClosure.json5 index 9e99a16b..a9b5616a 100644 --- a/xo-interpreter2/idl/IGCObject_DClosure.json5 +++ b/xo-interpreter2/idl/IGCObject_DClosure.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 index fe8670f1..1fbce208 100644 --- a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 +++ b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 index 4cced151..2b68d579 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 index 175b229e..ae284287 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 index 7d89a5ed..d36304b8 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 index 537c9860..63617067 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "ifelse", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 index 6945f3df..d2b68020 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "sequence", includes: [ "", "" diff --git a/xo-interpreter2/idl/IPrintable_DClosure.json5 b/xo-interpreter2/idl/IPrintable_DClosure.json5 index 2cfb3d33..2a1e2db9 100644 --- a/xo-interpreter2/idl/IPrintable_DClosure.json5 +++ b/xo-interpreter2/idl/IPrintable_DClosure.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 b/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 index 0a1205f5..79ef4c74 100644 --- a/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 +++ b/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 index ee4e8e64..45927399 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 index c78e0b88..bef2fb62 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 index 1dd1672a..c43c5160 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 index b9f70e6d..6490d444 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "ifelse", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 index 96b9c071..7b8e7ddd 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "sequence", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IProcedure_DClosure.json5 b/xo-interpreter2/idl/IProcedure_DClosure.json5 index d503f5c6..eec40c0c 100644 --- a/xo-interpreter2/idl/IProcedure_DClosure.json5 +++ b/xo-interpreter2/idl/IProcedure_DClosure.json5 @@ -1,5 +1,7 @@ { mode: "implementation", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ "", "", diff --git a/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 b/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 index 9fa3fe40..b52517ee 100644 --- a/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 +++ b/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/interpreter2", + output_hpp_dir: "include/xo/interpreter2", + output_impl_subdir: "detail", includes: [ //"", //"", diff --git a/xo-object2/idl/IGCObject_DArray.json5 b/xo-object2/idl/IGCObject_DArray.json5 index 3e1115e0..bef5bd62 100644 --- a/xo-object2/idl/IGCObject_DArray.json5 +++ b/xo-object2/idl/IGCObject_DArray.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "array", includes: [ "", "" diff --git a/xo-object2/idl/IGCObject_DBoolean.json5 b/xo-object2/idl/IGCObject_DBoolean.json5 index be131a38..c9aaf26b 100644 --- a/xo-object2/idl/IGCObject_DBoolean.json5 +++ b/xo-object2/idl/IGCObject_DBoolean.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "boolean", includes: [ "", "" diff --git a/xo-object2/idl/IGCObject_DFloat.json5 b/xo-object2/idl/IGCObject_DFloat.json5 index 2791de0b..eec1e3e3 100644 --- a/xo-object2/idl/IGCObject_DFloat.json5 +++ b/xo-object2/idl/IGCObject_DFloat.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "number", includes: [ "", "", diff --git a/xo-object2/idl/IGCObject_DInteger.json5 b/xo-object2/idl/IGCObject_DInteger.json5 index 6b865a4c..37d603e5 100644 --- a/xo-object2/idl/IGCObject_DInteger.json5 +++ b/xo-object2/idl/IGCObject_DInteger.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "number", includes: [ "", "" diff --git a/xo-object2/idl/IGCObject_DList.json5 b/xo-object2/idl/IGCObject_DList.json5 index e660b0c1..28fb3352 100644 --- a/xo-object2/idl/IGCObject_DList.json5 +++ b/xo-object2/idl/IGCObject_DList.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "list", includes: [ // "", // "" diff --git a/xo-object2/idl/IGCObject_DRuntimeError.json5 b/xo-object2/idl/IGCObject_DRuntimeError.json5 index 60d30cc7..cfcbe9f6 100644 --- a/xo-object2/idl/IGCObject_DRuntimeError.json5 +++ b/xo-object2/idl/IGCObject_DRuntimeError.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "error", includes: [ // "", // "" diff --git a/xo-object2/idl/IGCObject_DString.json5 b/xo-object2/idl/IGCObject_DString.json5 index 60c2165e..caf33fae 100644 --- a/xo-object2/idl/IGCObject_DString.json5 +++ b/xo-object2/idl/IGCObject_DString.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "string", includes: [ "", "" diff --git a/xo-object2/idl/IPrintable_DArray.json5 b/xo-object2/idl/IPrintable_DArray.json5 index eee19b52..b9bde4f4 100644 --- a/xo-object2/idl/IPrintable_DArray.json5 +++ b/xo-object2/idl/IPrintable_DArray.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "array", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DBoolean.json5 b/xo-object2/idl/IPrintable_DBoolean.json5 index 09245363..db949258 100644 --- a/xo-object2/idl/IPrintable_DBoolean.json5 +++ b/xo-object2/idl/IPrintable_DBoolean.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "boolean", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DFloat.json5 b/xo-object2/idl/IPrintable_DFloat.json5 index 427c5dce..d28680f0 100644 --- a/xo-object2/idl/IPrintable_DFloat.json5 +++ b/xo-object2/idl/IPrintable_DFloat.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "number", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DInteger.json5 b/xo-object2/idl/IPrintable_DInteger.json5 index 92c74376..478da579 100644 --- a/xo-object2/idl/IPrintable_DInteger.json5 +++ b/xo-object2/idl/IPrintable_DInteger.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "number", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DList.json5 b/xo-object2/idl/IPrintable_DList.json5 index 58b8ea82..a7a6bfb6 100644 --- a/xo-object2/idl/IPrintable_DList.json5 +++ b/xo-object2/idl/IPrintable_DList.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "list", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DRuntimeError.json5 b/xo-object2/idl/IPrintable_DRuntimeError.json5 index b9e291e0..a8404925 100644 --- a/xo-object2/idl/IPrintable_DRuntimeError.json5 +++ b/xo-object2/idl/IPrintable_DRuntimeError.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "error", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DString.json5 b/xo-object2/idl/IPrintable_DString.json5 index 8caffaab..8510938b 100644 --- a/xo-object2/idl/IPrintable_DString.json5 +++ b/xo-object2/idl/IPrintable_DString.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "string", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/ISequence_DArray.json5 b/xo-object2/idl/ISequence_DArray.json5 index 1f09b0bb..265c3795 100644 --- a/xo-object2/idl/ISequence_DArray.json5 +++ b/xo-object2/idl/ISequence_DArray.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "array", includes: [ ], local_types: [ ], namespace1: "xo", diff --git a/xo-object2/idl/ISequence_DList.json5 b/xo-object2/idl/ISequence_DList.json5 index edf0e8dc..2ff69f04 100644 --- a/xo-object2/idl/ISequence_DList.json5 +++ b/xo-object2/idl/ISequence_DList.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "list", includes: [ "" ], local_types: [ ], namespace1: "xo", diff --git a/xo-object2/idl/Sequence.json5 b/xo-object2/idl/Sequence.json5 index 5c5139da..20271697 100644 --- a/xo-object2/idl/Sequence.json5 +++ b/xo-object2/idl/Sequence.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/object2", + output_hpp_dir: "include/xo/object2", + output_impl_subdir: "sequence", includes: [""], // extra includes in Sequence.hpp, if any user_hpp_includes: [], diff --git a/xo-printable2/idl/Printable.json5 b/xo-printable2/idl/Printable.json5 index 41799c43..9926e73e 100644 --- a/xo-printable2/idl/Printable.json5 +++ b/xo-printable2/idl/Printable.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/printable2", + output_hpp_dir: "include/xo/printable2", + output_impl_subdir: "detail", includes: [""], // extra includes in Printable.hpp user_hpp_includes: ["\"detail/ppdetail_Printable.hpp\""], diff --git a/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 b/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 index 79ee61d4..cd17ae4f 100644 --- a/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 +++ b/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/procedure2", + output_hpp_dir: "include/xo/procedure2", + output_impl_subdir: "detail", includes: [ // "", diff --git a/xo-procedure2/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 b/xo-procedure2/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 index 5eb7bf34..ee3a1951 100644 --- a/xo-procedure2/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 +++ b/xo-procedure2/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/procedure2", + output_hpp_dir: "include/xo/procedure2", + output_impl_subdir: "detail", includes: [ "", "", diff --git a/xo-procedure2/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 b/xo-procedure2/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 index b0a770fd..b50a8634 100644 --- a/xo-procedure2/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 +++ b/xo-procedure2/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/procedure2", + output_hpp_dir: "include/xo/procedure2", + output_impl_subdir: "detail", includes: [ "", "", diff --git a/xo-procedure2/idl/IRuntimeContext_DSimpleRcx.json5 b/xo-procedure2/idl/IRuntimeContext_DSimpleRcx.json5 index 4765285d..324526f7 100644 --- a/xo-procedure2/idl/IRuntimeContext_DSimpleRcx.json5 +++ b/xo-procedure2/idl/IRuntimeContext_DSimpleRcx.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/procedure2", + output_hpp_dir: "include/xo/procedure2", + output_impl_subdir: "detail", includes: [ //"", //"", diff --git a/xo-procedure2/idl/Procedure.json5 b/xo-procedure2/idl/Procedure.json5 index 7933c3a2..b45227d0 100644 --- a/xo-procedure2/idl/Procedure.json5 +++ b/xo-procedure2/idl/Procedure.json5 @@ -5,6 +5,8 @@ { mode: "facet", output_cpp_dir: "src/procedure2", + output_hpp_dir: "include/xo/procedure2", + output_impl_subdir: "detail", // includes in ASyntaxStateMachine.hpp includes: [ "\"RuntimeContext.hpp\"", diff --git a/xo-procedure2/idl/RuntimeContext.json5 b/xo-procedure2/idl/RuntimeContext.json5 index c896cc64..07ed5b00 100644 --- a/xo-procedure2/idl/RuntimeContext.json5 +++ b/xo-procedure2/idl/RuntimeContext.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/procedure2", + output_hpp_dir: "include/xo/procedure2", + output_impl_subdir: "detail", // includes in ARuntimeContext.hpp includes: [ "" diff --git a/xo-reader2/idl/IPrintable_DApplySsm.json5 b/xo-reader2/idl/IPrintable_DApplySsm.json5 index 5895578d..6f2a531d 100644 --- a/xo-reader2/idl/IPrintable_DApplySsm.json5 +++ b/xo-reader2/idl/IPrintable_DApplySsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DDefineSsm.json5 b/xo-reader2/idl/IPrintable_DDefineSsm.json5 index 3975396e..28463e92 100644 --- a/xo-reader2/idl/IPrintable_DDefineSsm.json5 +++ b/xo-reader2/idl/IPrintable_DDefineSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 b/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 index b6b0caa1..f5465709 100644 --- a/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 b/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 index 6b1bf863..73389166 100644 --- a/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 b/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 index 7f566150..1aa3c951 100644 --- a/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 b/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 index 1d003791..fee89873 100644 --- a/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 b/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 index 4c3b8964..463cb399 100644 --- a/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DIfElseSsm.json5 b/xo-reader2/idl/IPrintable_DIfElseSsm.json5 index 9c54fc71..dbcdbb0a 100644 --- a/xo-reader2/idl/IPrintable_DIfElseSsm.json5 +++ b/xo-reader2/idl/IPrintable_DIfElseSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DLambdaSsm.json5 b/xo-reader2/idl/IPrintable_DLambdaSsm.json5 index 9f2187df..035f71f1 100644 --- a/xo-reader2/idl/IPrintable_DLambdaSsm.json5 +++ b/xo-reader2/idl/IPrintable_DLambdaSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DParenSsm.json5 b/xo-reader2/idl/IPrintable_DParenSsm.json5 index 9af85828..9750cb31 100644 --- a/xo-reader2/idl/IPrintable_DParenSsm.json5 +++ b/xo-reader2/idl/IPrintable_DParenSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DProgressSsm.json5 b/xo-reader2/idl/IPrintable_DProgressSsm.json5 index eb420da3..d3d298b1 100644 --- a/xo-reader2/idl/IPrintable_DProgressSsm.json5 +++ b/xo-reader2/idl/IPrintable_DProgressSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DSequenceSsm.json5 b/xo-reader2/idl/IPrintable_DSequenceSsm.json5 index 929060b0..f5c89aca 100644 --- a/xo-reader2/idl/IPrintable_DSequenceSsm.json5 +++ b/xo-reader2/idl/IPrintable_DSequenceSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 b/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 index 8349bb04..d3c78474 100644 --- a/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 +++ b/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 index 2f08ccc5..bc433fdf 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 index 7aef2f5a..8b3fff2a 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 index 0b04e3d6..d1c78ad2 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 index 83627a07..e3486759 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 index 535e713f..019573d0 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 index 288b8256..49248b62 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 index 04617d60..68883ef0 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 index 23a4e35d..25feadde 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 index bd32a95b..413c64c8 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 index 9d24338d..7ea19fc0 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 index 9a141775..83c10717 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 index c9319948..e497ef7f 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 index e94779f5..7a91622f 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 @@ -1,6 +1,8 @@ { mode: "implementation", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/SyntaxStateMachine.json5 b/xo-reader2/idl/SyntaxStateMachine.json5 index d204a265..210a43a4 100644 --- a/xo-reader2/idl/SyntaxStateMachine.json5 +++ b/xo-reader2/idl/SyntaxStateMachine.json5 @@ -1,6 +1,8 @@ { mode: "facet", output_cpp_dir: "src/reader2", + output_hpp_dir: "include/xo/reader2", + output_impl_subdir: "ssm", // includes in ASyntaxStateMachine.hpp includes: [ "\"ParserStateMachine.hpp\"",