From 54123c0e1f70dfa19d89a0a3d26c9fe17ac5a713 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 11 Mar 2026 10:03:46 -0500 Subject: [PATCH] build: retire FACET argument to genfacetimpl --- xo-cmake/cmake/xo_macros/xo_cxx.cmake | 4 --- xo-expression2/CMakeLists.txt | 32 ------------------------ xo-interpreter2/CMakeLists.txt | 20 --------------- xo-numeric/CMakeLists.txt | 2 -- xo-object2/CMakeLists.txt | 16 ------------ xo-procedure2/CMakeLists.txt | 13 ---------- xo-reader2/CMakeLists.txt | 36 --------------------------- xo-stringtable2/CMakeLists.txt | 4 --- xo-type/CMakeLists.txt | 8 ------ 9 files changed, 135 deletions(-) diff --git a/xo-cmake/cmake/xo_macros/xo_cxx.cmake b/xo-cmake/cmake/xo_macros/xo_cxx.cmake index d6fb9369..52169a3d 100644 --- a/xo-cmake/cmake/xo_macros/xo_cxx.cmake +++ b/xo-cmake/cmake/xo_macros/xo_cxx.cmake @@ -1736,7 +1736,6 @@ function(xo_add_genfacetimpl) set(oneValueArgs TARGET # Name for this generation target FACET_PKG # package providing abstract interface - FACET # facet name INPUT # Input .json5 file ) set(multiValueArgs "") @@ -1746,9 +1745,6 @@ function(xo_add_genfacetimpl) if(NOT DEFINED GF_TARGET) message(FATAL_ERROR "xo_add_genfacetimpl: TARGET is required") endif() - if(NOT DEFINED GF_FACET) - message(FATAL_ERROR "xo_add_genfacetimpl: FACET is required") - endif() if(NOT DEFINED GF_INPUT) message(FATAL_ERROR "xo_add_genfacetimpl: INPUT is required") endif() diff --git a/xo-expression2/CMakeLists.txt b/xo-expression2/CMakeLists.txt index 3dc7c5da..b6fb40d7 100644 --- a/xo-expression2/CMakeLists.txt +++ b/xo-expression2/CMakeLists.txt @@ -37,7 +37,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-symboltable-localsymtab FACET_PKG xo_expression2 - FACET SymbolTable # REPR LocalSymtab INPUT idl/ISymbolTable_DLocalSymtab.json5 ) @@ -46,7 +45,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-localsymtab FACET_PKG xo_alloc2 - FACET GCObject # REPR LocalSymtab INPUT idl/IGCObject_DLocalSymtab.json5 ) @@ -55,7 +53,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-localsymtab FACET_PKG xo_printable2 - FACET Printable # REPR LocalSymtab INPUT idl/IPrintable_DLocalSymtab.json5 ) @@ -66,7 +63,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-symboltable-globalsymtab FACET_PKG xo_expression2 - FACET SymbolTable # REPR GlobalSymtab INPUT idl/ISymbolTable_DGlobalSymtab.json5 ) @@ -75,7 +71,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-globalsymtab FACET_PKG xo_alloc2 - FACET GCObject # REPR GlobalSymtab INPUT idl/IGCObject_DGlobalSymtab.json5 ) @@ -84,7 +79,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-globalsymtab FACET_PKG xo_printable2 - FACET Printable # REPR GlobalSymtab INPUT idl/IPrintable_DGlobalSymtab.json5 ) @@ -106,7 +100,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-constant FACET_PKG xo_expression2 - FACET Expression # REPR Constant INPUT idl/IExpression_DConstant.json5 ) @@ -115,7 +108,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-constant FACET_PKG xo_alloc2 - FACET GCObject # REPR Constant INPUT idl/IGCObject_DConstant.json5 ) @@ -124,7 +116,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-constant FACET_PKG xo_printable2 - FACET Printable # REPR Constant INPUT idl/IPrintable_DConstant.json5 ) @@ -135,7 +126,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-variable FACET_PKG xo_expression2 - FACET Expression # REPR Variable INPUT idl/IExpression_DVariable.json5 ) @@ -144,7 +134,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-variable FACET_PKG xo_alloc2 - FACET GCObject # REPR Variable INPUT idl/IGCObject_DVariable.json5 ) @@ -153,7 +142,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-variable FACET_PKG xo_printable2 - FACET Printable # REPR Variable INPUT idl/IPrintable_DVariable.json5 ) @@ -164,7 +152,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-typename FACET_PKG xo_alloc2 - FACET GCObject # REPR Typename INPUT idl/IGCObject_DTypename.json5 ) @@ -173,7 +160,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-typename FACET_PKG xo_printable2 - FACET Printable # REPR Typename INPUT idl/IPrintable_DTypename.json5 ) @@ -184,7 +170,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-varref FACET_PKG xo_expression2 - FACET Expression # REPR VarRef INPUT idl/IExpression_DVarRef.json5 ) @@ -193,7 +178,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-varref FACET_PKG xo_alloc2 - FACET GCObject # REPR VarRef INPUT idl/IGCObject_DVarRef.json5 ) @@ -202,7 +186,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-varref FACET_PKG xo_printable2 - FACET Printable # REPR VarRef INPUT idl/IPrintable_DVarRef.json5 ) @@ -213,7 +196,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-defineexpr FACET_PKG xo_expression2 - FACET Expression # REPR DefineExpr INPUT idl/IExpression_DDefineExpr.json5 ) @@ -222,7 +204,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-defineexpr FACET_PKG xo_alloc2 - FACET GCObject # REPR DefineExpr INPUT idl/IGCObject_DDefineExpr.json5 ) @@ -231,7 +212,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-defineexpr FACET_PKG xo_printable2 - FACET Printable # REPR DefineExpr INPUT idl/IPrintable_DDefineExpr.json5 ) @@ -242,7 +222,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-applyexpr FACET_PKG xo_expression2 - FACET Expression # REPR ApplyExpr INPUT idl/IExpression_DApplyExpr.json5 ) @@ -251,7 +230,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-applyexpr FACET_PKG xo_alloc2 - FACET GCObject # REPR ApplyExpr INPUT idl/IGCObject_DApplyExpr.json5 ) @@ -260,7 +238,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-applyexpr FACET_PKG xo_printable2 - FACET Printable # REPR ApplyExpr INPUT idl/IPrintable_DApplyExpr.json5 ) @@ -271,7 +248,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-lambdaexpr FACET_PKG xo_expression2 - FACET Expression # REPR LambdaExpr INPUT idl/IExpression_DLambdaExpr.json5 ) @@ -280,7 +256,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-lambdaexpr FACET_PKG xo_alloc2 - FACET GCObject # REPR LambdaExpr INPUT idl/IGCObject_DLambdaExpr.json5 ) @@ -289,7 +264,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-lambdaexpr FACET_PKG xo_printable2 - FACET Printable # REPR LambdaExpr INPUT idl/IPrintable_DLambdaExpr.json5 ) @@ -300,7 +274,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-ifelseexpr FACET_PKG xo_expression2 - FACET Expression # REPR IfElseExpr INPUT idl/IExpression_DIfElseExpr.json5 ) @@ -309,7 +282,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-ifelseexpr FACET_PKG xo_alloc2 - FACET GCObject INPUT idl/IGCObject_DIfElseExpr.json5 ) @@ -317,7 +289,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-ifelseexpr FACET_PKG xo_printable2 - FACET Printable INPUT idl/IPrintable_DIfElseExpr.json5 ) @@ -327,7 +298,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-sequenceexpr FACET_PKG xo_expression2 - FACET Expression INPUT idl/IExpression_DSequenceExpr.json5 ) @@ -335,7 +305,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-gcobject-sequenceexpr FACET_PKG xo_alloc2 - FACET GCObject INPUT idl/IGCObject_DSequenceExpr.json5 ) @@ -343,7 +312,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-sequenceexpr FACET_PKG xo_printable2 - FACET Printable INPUT idl/IPrintable_DSequenceExpr.json5 ) diff --git a/xo-interpreter2/CMakeLists.txt b/xo-interpreter2/CMakeLists.txt index 32db85f2..229bf176 100644 --- a/xo-interpreter2/CMakeLists.txt +++ b/xo-interpreter2/CMakeLists.txt @@ -30,7 +30,6 @@ add_subdirectory(utest) xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmdefcontframe FACET_PKG xo_alloc2 - FACET GCObject # REPR VsmDefContFrame INPUT idl/IGCObject_DVsmDefContFrame.json5 ) @@ -39,7 +38,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmdefcontframe FACET_PKG xo_printable2 - FACET Printable # REPR VsmDefContFrame INPUT idl/IPrintable_DVsmDefContFrame.json5 ) @@ -50,7 +48,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmapplyframe FACET_PKG xo_alloc2 - FACET GCObject # REPR VsmApplyFrame INPUT idl/IGCObject_DVsmApplyFrame.json5 ) @@ -59,7 +56,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmapplyframe FACET_PKG xo_printable2 - FACET Printable # REPR VsmApplyFrame INPUT idl/IPrintable_DVsmApplyFrame.json5 ) @@ -70,7 +66,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmevalargsframe FACET_PKG xo_alloc2 - FACET GCObject # REPR VsmEvalArgsFrame INPUT idl/IGCObject_DVsmEvalArgsFrame.json5 ) @@ -79,7 +74,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmevalargsframe FACET_PKG xo_printable2 - FACET Printable # REPR DVsmEvalArgsFrame INPUT idl/IPrintable_DVsmEvalArgsFrame.json5 ) @@ -90,7 +84,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmapplyclosureframe FACET_PKG xo_alloc2 - FACET GCObject # REPR VsmApplyClosureFrame INPUT idl/IGCObject_DVsmApplyClosureFrame.json5 ) @@ -99,7 +92,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmapplyclosureframe FACET_PKG xo_printable2 - FACET Printable # REPR DVsmApplyClosureFrame INPUT idl/IPrintable_DVsmApplyClosureFrame.json5 ) @@ -110,7 +102,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmifelsecontframe FACET_PKG xo_alloc2 - FACET GCObject # REPR VsmIfElseContFrame INPUT idl/IGCObject_DVsmIfElseContFrame.json5 ) @@ -119,7 +110,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmifelsecontframe FACET_PKG xo_printable2 - FACET Printable # REPR VsmIfElseContFrame INPUT idl/IPrintable_DVsmIfElseContFrame.json5 ) @@ -130,7 +120,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmseqcontframe FACET_PKG xo_alloc2 - FACET GCObject # REPR VsmSeqContFrame INPUT idl/IGCObject_DVsmSeqContFrame.json5 ) @@ -139,7 +128,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmseqcontframe FACET_PKG xo_printable2 - FACET Printable # REPR DVsmSeqContFrame INPUT idl/IPrintable_DVsmSeqContFrame.json5 ) @@ -151,7 +139,6 @@ xo_add_genfacetimpl( #xo_add_genfacetimpl( # TARGET xo-interpreter2-facetimpl-procedure-closure # FACET_PKG xo_procedure2 -# FACET Procedure # REPR Closure # INPUT idl/IProcedure_DClosure.json5 #) @@ -160,7 +147,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-closure FACET_PKG xo_alloc2 - FACET GCObject # REPR Closure INPUT idl/IGCObject_DClosure.json5 ) @@ -169,7 +155,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-closure FACET_PKG xo_printable2 - FACET Printable # REPR Closure INPUT idl/IPrintable_DClosure.json5 ) @@ -180,7 +165,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-globalenv FACET_PKG xo_alloc2 - FACET GCObject # REPR GlobalEnv INPUT idl/IGCObject_DGlobalEnv.json5 ) @@ -189,7 +173,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-globalenv FACET_PKG xo_printable2 - FACET Printable # REPR GlobalEnv INPUT idl/IPrintable_DGlobalEnv.json5 ) @@ -200,7 +183,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-localenv FACET_PKG xo_alloc2 - FACET GCObject # REPR LocalEnv INPUT idl/IGCObject_DLocalEnv.json5 ) @@ -209,7 +191,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-localenv FACET_PKG xo_printable2 - FACET Printable # REPR LocalEnv INPUT idl/IPrintable_DLocalEnv.json5 ) @@ -219,7 +200,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-runtimecontext-vsmrcx FACET_PKG xo_procedure2 - FACET RuntimeContext # REPR DVsmRcx INPUT idl/IRuntimeContext_DVsmRcx.json5 ) diff --git a/xo-numeric/CMakeLists.txt b/xo-numeric/CMakeLists.txt index b63fe4a0..fa98c6a4 100644 --- a/xo-numeric/CMakeLists.txt +++ b/xo-numeric/CMakeLists.txt @@ -33,7 +33,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-numeric-facetimpl-numeric-float FACET_PKG xo_numeric - FACET Numeric # REPR Float INPUT idl/INumeric_DFloat.json5 ) @@ -42,7 +41,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-numeric-facetimpl-numeric-integer FACET_PKG xo_numeric - FACET Numeric # REPR Integer INPUT idl/INumeric_DInteger.json5 ) diff --git a/xo-object2/CMakeLists.txt b/xo-object2/CMakeLists.txt index 151d3ed8..23cbf6b1 100644 --- a/xo-object2/CMakeLists.txt +++ b/xo-object2/CMakeLists.txt @@ -31,7 +31,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-sequence-list FACET_PKG xo_object2 - FACET Sequence # REPR List INPUT idl/ISequence_DList.json5 ) @@ -40,7 +39,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-list FACET_PKG xo_printable2 - FACET Printable # REPR List INPUT idl/IPrintable_DList.json5 ) @@ -49,7 +47,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-list FACET_PKG xo_alloc2 - FACET GCObject # REPR List INPUT idl/IGCObject_DList.json5 ) @@ -60,7 +57,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-boolean FACET_PKG xo_printable2 - FACET Printable # REPR Boolean INPUT idl/IPrintable_DBoolean.json5 ) @@ -69,7 +65,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-boolean FACET_PKG xo_alloc2 - FACET GCObject # REPR Boolean INPUT idl/IGCObject_DBoolean.json5 ) @@ -80,7 +75,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-float FACET_PKG xo_printable2 - FACET Printable # REPR Float INPUT idl/IPrintable_DFloat.json5 ) @@ -89,7 +83,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-float FACET_PKG xo_alloc2 - FACET GCObject # REPR Float INPUT idl/IGCObject_DFloat.json5 ) @@ -100,7 +93,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-integer FACET_PKG xo_printable2 - FACET Printable # REPR Integer INPUT idl/IPrintable_DInteger.json5 ) @@ -109,7 +101,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-integer FACET_PKG xo_alloc2 - FACET GCObject # REPR Integer INPUT idl/IGCObject_DInteger.json5 ) @@ -120,7 +111,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-sequence-array FACET_PKG xo_object2 - FACET Sequence # REPR Array INPUT idl/ISequence_DArray.json5 ) @@ -129,7 +119,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-array FACET_PKG xo_printable2 - FACET Printable # REPR Array INPUT idl/IPrintable_DArray.json5 ) @@ -138,7 +127,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-array FACET_PKG xo_alloc2 - FACET GCObject # REPR Array INPUT idl/IGCObject_DArray.json5 ) @@ -149,7 +137,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-dictionary FACET_PKG xo_printable2 - FACET Printable # REPR Dictionary INPUT idl/IPrintable_DDictionary.json5 ) @@ -158,7 +145,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-dictionary FACET_PKG xo_alloc2 - FACET GCObject # REPR Dictionary INPUT idl/IGCObject_DDictionary.json5 ) @@ -169,7 +155,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-runtimeerror FACET_PKG xo_printable2 - FACET Printable # REPR RuntimeError INPUT idl/IPrintable_DRuntimeError.json5 ) @@ -178,7 +163,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-runtimeerror FACET_PKG xo_alloc2 - FACET GCObject # REPR RuntimeError INPUT idl/IGCObject_DRuntimeError.json5 ) diff --git a/xo-procedure2/CMakeLists.txt b/xo-procedure2/CMakeLists.txt index eb4a0fb4..15a6d329 100644 --- a/xo-procedure2/CMakeLists.txt +++ b/xo-procedure2/CMakeLists.txt @@ -39,7 +39,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-runtimecontext-simplercx FACET_PKG xo_procedure2 - FACET RuntimeContext # REPR DSimpleRcx INPUT idl/IRuntimeContext_DSimpleRcx.json5 ) @@ -50,7 +49,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-procedure-primitive_gco_0 FACET_PKG xo_procedure2 - FACET Procedure # REPR DPrimitive_gco_0 INPUT idl/IProcedure_DPrimitive_gco_0.json5 ) @@ -59,7 +57,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_0 FACET_PKG xo_alloc2 - FACET GCObject # REPR Primitive_gco_0 INPUT idl/IGCObject_DPrimitive_gco_0.json5 ) @@ -68,7 +65,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-printable-primitive_gco_0 FACET_PKG xo_printable2 - FACET Printable # REPR Primitive_gco_0 INPUT idl/IPrintable_DPrimitive_gco_0.json5 ) @@ -79,7 +75,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-procedure-primitive_gco_1_gco FACET_PKG xo_procedure2 - FACET Procedure # REPR DPrimitive_gco_1_gco INPUT idl/IProcedure_DPrimitive_gco_1_gco.json5 ) @@ -88,7 +83,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_1_gco FACET_PKG xo_alloc2 - FACET GCObject # REPR Primitive_gco_1_gco INPUT idl/IGCObject_DPrimitive_gco_1_gco.json5 ) @@ -97,7 +91,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-printable-primitive_gco_1_gco FACET_PKG xo_printable2 - FACET Printable # REPR Primitive_gco_1_gco INPUT idl/IPrintable_DPrimitive_gco_1_gco.json5 ) @@ -108,7 +101,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-procedure-primitive_gco_2_gco_gco FACET_PKG xo_procedure2 - FACET Procedure # REPR DPrimitive_gco_2_gco_gco INPUT idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 ) @@ -117,7 +109,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_2_gco_gco FACET_PKG xo_alloc2 - FACET GCObject # REPR Primitive_gco_2_gco_gco INPUT idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 ) @@ -126,7 +117,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-printable-primitive_gco_2_gco_gco FACET_PKG xo_printable2 - FACET Printable # REPR Primitive_gco_2_gco_gco INPUT idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 ) @@ -137,7 +127,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-procedure-primitive_gco_3_dict_string_gco FACET_PKG xo_procedure2 - FACET Procedure # REPR Dprimitive_gco_3_dict_string_gco INPUT idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5 ) @@ -146,7 +135,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_3_dict_string_gco FACET_PKG xo_alloc2 - FACET GCObject # REPR primitive_gco_3_dict_string_gco INPUT idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5 ) @@ -155,7 +143,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-procedure2-facetimpl-printable-primitive_gco_3_dict_string_gco FACET_PKG xo_printable2 - FACET Printable # REPR primitive_gco_3_dict_string_gco INPUT idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5 ) diff --git a/xo-reader2/CMakeLists.txt b/xo-reader2/CMakeLists.txt index 6605df49..93f23788 100644 --- a/xo-reader2/CMakeLists.txt +++ b/xo-reader2/CMakeLists.txt @@ -37,7 +37,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-toplevelseqssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ToplevelSeqSsm INPUT idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 ) @@ -46,7 +45,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-toplevelseqssm FACET_PKG xo_printable2 - FACET Printable # REPR ToplevelSeqSsm INPUT idl/IPrintable_DToplevelSeqSsm.json5 ) @@ -57,7 +55,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-definessm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR DefineSsm INPUT idl/ISyntaxStateMachine_DDefineSsm.json5 ) @@ -66,7 +63,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-definessm FACET_PKG xo_printable2 - FACET Printable # REPR DefineSsm INPUT idl/IPrintable_DDefineSsm.json5 ) @@ -77,7 +73,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-deftypessm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR DeftypeSsm INPUT idl/ISyntaxStateMachine_DDeftypeSsm.json5 ) @@ -86,7 +81,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-deftypessm FACET_PKG xo_printable2 - FACET Printable # REPR DeftypeSsm INPUT idl/IPrintable_DDeftypeSsm.json5 ) @@ -97,7 +91,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-lambdassm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR LambdaSsm INPUT idl/ISyntaxStateMachine_DLambdaSsm.json5 ) @@ -106,7 +99,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-lambdassm FACET_PKG xo_printable2 - FACET Printable # REPR LambdaSsm INPUT idl/IPrintable_DLambdaSsm.json5 ) @@ -117,7 +109,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-parenssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ParenSsm INPUT idl/ISyntaxStateMachine_DParenSsm.json5 ) @@ -126,7 +117,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-parenssm FACET_PKG xo_printable2 - FACET Printable # REPR ParenSsm INPUT idl/IPrintable_DParenSsm.json5 ) @@ -137,7 +127,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectformalarglistssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectFormalArglistSsm INPUT idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 ) @@ -146,7 +135,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectformalarglistssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectFormalArglistSsm INPUT idl/IPrintable_DExpectFormalArglistSsm.json5 ) @@ -157,7 +145,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectformalargssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectFormalArgSsm INPUT idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 ) @@ -166,7 +153,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectformalargssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectFormalArgSsm INPUT idl/IPrintable_DExpectFormalArgSsm.json5 ) @@ -177,7 +163,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-ifelsessm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR IfElseSsm INPUT idl/ISyntaxStateMachine_DIfElseSsm.json5 ) @@ -186,7 +171,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-ifelsessm FACET_PKG xo_printable2 - FACET Printable # REPR IfElseSsm INPUT idl/IPrintable_DIfElseSsm.json5 ) @@ -197,7 +181,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-sequencessm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR SequenceSsm INPUT idl/ISyntaxStateMachine_DSequenceSsm.json5 ) @@ -206,7 +189,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-sequencessm FACET_PKG xo_printable2 - FACET Printable # REPR SequenceSsm INPUT idl/IPrintable_DSequenceSsm.json5 ) @@ -217,7 +199,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-applyssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ApplySsm INPUT idl/ISyntaxStateMachine_DApplySsm.json5 ) @@ -226,7 +207,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-applyssm FACET_PKG xo_printable2 - FACET Printable # REPR ApplySsm INPUT idl/IPrintable_DApplySsm.json5 ) @@ -237,7 +217,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectsymbolssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectSymbolSsm INPUT idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 ) @@ -246,7 +225,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectsymbolssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectSymbolSsm INPUT idl/IPrintable_DExpectSymbolSsm.json5 ) @@ -257,7 +235,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expecttypessm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectTypeSsm INPUT idl/ISyntaxStateMachine_DExpectTypeSsm.json5 ) @@ -266,7 +243,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expecttypessm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectTypeSsm INPUT idl/IPrintable_DExpectTypeSsm.json5 ) @@ -277,7 +253,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectexprssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectExprSsm INPUT idl/ISyntaxStateMachine_DExpectExprSsm.json5 ) @@ -286,7 +261,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectexprssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectExprSsm INPUT idl/IPrintable_DExpectExprSsm.json5 ) @@ -297,7 +271,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-progressssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ProgressSsm INPUT idl/ISyntaxStateMachine_DProgressSsm.json5 ) @@ -306,7 +279,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-progressssm FACET_PKG xo_printable2 - FACET Printable # REPR ProgressSsm INPUT idl/IPrintable_DProgressSsm.json5 ) @@ -317,7 +289,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-quotessm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR QuoteSsm INPUT idl/ISyntaxStateMachine_DQuoteSsm.json5 ) @@ -326,7 +297,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-quotessm FACET_PKG xo_printable2 - FACET Printable # REPR QuoteSsm INPUT idl/IPrintable_DQuoteSsm.json5 ) @@ -337,7 +307,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectqliteralssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectQLiteralSsm INPUT idl/ISyntaxStateMachine_DExpectQLiteralSsm.json5 ) @@ -346,7 +315,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectqliteralssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectQLiteralSsm INPUT idl/IPrintable_DExpectQLiteralSsm.json5 ) @@ -357,7 +325,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectqlistssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectQListSsm INPUT idl/ISyntaxStateMachine_DExpectQListSsm.json5 ) @@ -366,7 +333,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectqlistssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectQListSsm INPUT idl/IPrintable_DExpectQListSsm.json5 ) @@ -377,7 +343,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-syntaxstatemachine-expectqarrayssm FACET_PKG xo_reader2 - FACET SyntaxStateMachine # REPR ExpectQArraySsm INPUT idl/ISyntaxStateMachine_DExpectQArraySsm.json5 ) @@ -386,7 +351,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-reader2-facetimpl-printable-expectqarrayssm FACET_PKG xo_printable2 - FACET Printable # REPR ExpectQArraySsm INPUT idl/IPrintable_DExpectQArraySsm.json5 ) diff --git a/xo-stringtable2/CMakeLists.txt b/xo-stringtable2/CMakeLists.txt index deeb3a70..c3dd0a6a 100644 --- a/xo-stringtable2/CMakeLists.txt +++ b/xo-stringtable2/CMakeLists.txt @@ -23,7 +23,6 @@ add_definitions(${PROJECT_CXX_FLAGS}) xo_add_genfacetimpl( TARGET xo-stringtable2-facetimpl-gcobject-string FACET_PKG xo_alloc2 - FACET GCObject # REPR String INPUT idl/IGCObject_DString.json5 ) @@ -32,7 +31,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-stringtable2-facetimpl-printable-string FACET_PKG xo_printable2 - FACET Printable # REPR String INPUT idl/IPrintable_DString.json5 ) @@ -43,7 +41,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-stringtable2-facetimpl-gcobject-uniquestring FACET_PKG xo_alloc2 - FACET GCObject # REPR UniqueString INPUT idl/IGCObject_DUniqueString.json5 ) @@ -52,7 +49,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-stringtable2-facetimpl-printable-uniquestring FACET_PKG xo_printable2 - FACET Printable # REPR UniqueString INPUT idl/IPrintable_DUniqueString.json5 ) diff --git a/xo-type/CMakeLists.txt b/xo-type/CMakeLists.txt index bfa7668d..0c7d3805 100644 --- a/xo-type/CMakeLists.txt +++ b/xo-type/CMakeLists.txt @@ -34,7 +34,6 @@ xo_add_genfacet( xo_add_genfacetimpl( TARGET xo-type-facetimpl-type-atomictype FACET_PKG xo_type - FACET Type # REPR AtomicType INPUT idl/IType_DAtomicType.json5 ) @@ -43,7 +42,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-gcobject-atomictype FACET_PKG xo_alloc2 - FACET GCObject # REPR AtomicType INPUT idl/IGCObject_DAtomicType.json5 ) @@ -54,7 +52,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-type-listtype FACET_PKG xo_type - FACET Type # REPR ListType INPUT idl/IType_DListType.json5 ) @@ -63,7 +60,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-gcobject-listtype FACET_PKG xo_alloc2 - FACET GCObject # REPR ListType INPUT idl/IGCObject_DListType.json5 ) @@ -74,7 +70,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-type-arraytype FACET_PKG xo_type - FACET Type # REPR ArrayType INPUT idl/IType_DArrayType.json5 ) @@ -83,7 +78,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-gcobject-arraytype FACET_PKG xo_alloc2 - FACET GCObject # REPR ArrayType INPUT idl/IGCObject_DArrayType.json5 ) @@ -94,7 +88,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-type-functiontype FACET_PKG xo_type - FACET Type # REPR FunctionType INPUT idl/IType_DFunctionType.json5 ) @@ -103,7 +96,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-type-facetimpl-gcobject-functiontype FACET_PKG xo_alloc2 - FACET GCObject # REPR FunctionType INPUT idl/IGCObject_DFunctionType.json5 )