|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:27
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/struct Modified Files: StructTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: StructTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/struct/StructTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StructTest.java 13 Nov 2006 17:00:50 -0000 1.2 --- StructTest.java 18 Jan 2007 17:11:47 -0000 1.3 *************** *** 11,15 **** import ccmtools.metamodel.BaseIDL.MFieldDef; import ccmtools.metamodel.BaseIDL.MIDLType; - import ccmtools.metamodel.BaseIDL.MModuleDef; import ccmtools.metamodel.BaseIDL.MPrimitiveDef; import ccmtools.metamodel.BaseIDL.MPrimitiveKind; --- 11,14 ---- *************** *** 17,21 **** import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 16,20 ---- import ccmtools.metamodel.BaseIDL.MStructDef; import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 82,86 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 81,85 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 91,95 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 90,94 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); |