Menu
▾
▴
ccmtools-cvs — Notification of CVS commits for the CCM Tools
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(86) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(114) |
Feb
(254) |
Mar
(166) |
Apr
(122) |
May
(131) |
Jun
(59) |
Jul
(201) |
Aug
(85) |
Sep
(80) |
Oct
(64) |
Nov
(103) |
Dec
(36) |
| 2005 |
Jan
(231) |
Feb
(204) |
Mar
(71) |
Apr
(54) |
May
(50) |
Jun
(120) |
Jul
(17) |
Aug
(124) |
Sep
(75) |
Oct
(154) |
Nov
(37) |
Dec
(143) |
| 2006 |
Jan
(346) |
Feb
(170) |
Mar
|
Apr
|
May
(273) |
Jun
(113) |
Jul
(427) |
Aug
(570) |
Sep
(212) |
Oct
(550) |
Nov
(348) |
Dec
(314) |
| 2007 |
Jan
(709) |
Feb
(223) |
Mar
(104) |
Apr
(24) |
May
(11) |
Jun
(3) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:58:15
|
Update of /cvsroot/ccmtools/cpp-environment/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1313/utils Added Files: Confix2.dir Confix2.pkg Log Message: Added utils package for the case that wx-utils are not installed. --- NEW FILE: Confix2.pkg --- PACKAGE_NAME('ccm-runtime-utils') PACKAGE_VERSION('0.8.5') --- NEW FILE: Confix2.dir --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:58:15
|
Update of /cvsroot/ccmtools/cpp-environment/externals In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1313/externals Modified Files: Confix2.pkg Log Message: Added utils package for the case that wx-utils are not installed. Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/externals/Confix2.pkg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Confix2.pkg 5 Jan 2007 14:09:32 -0000 1.1 --- Confix2.pkg 19 Jan 2007 11:58:11 -0000 1.2 *************** *** 1,5 **** ! # -*- python -*- ! ! PACKAGE_NAME('ccm-externals') ! PACKAGE_VERSION('2.0.0') --- 1,3 ---- ! PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.5') |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:57:55
|
Update of /cvsroot/ccmtools/cpp-environment/utils/smartptr In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1291/utils/smartptr Log Message: Directory /cvsroot/ccmtools/cpp-environment/utils/smartptr added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:57:55
|
Update of /cvsroot/ccmtools/cpp-environment/utils/values In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1291/utils/values Log Message: Directory /cvsroot/ccmtools/cpp-environment/utils/values added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 11:57:55
|
Update of /cvsroot/ccmtools/cpp-environment/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1291/utils Log Message: Directory /cvsroot/ccmtools/cpp-environment/utils added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 09:35:40
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13188/ccm/local Modified Files: Confix2.pkg Log Message: Moved to version number 0.8.5 Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/Confix2.pkg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Confix2.pkg 15 Jan 2007 15:01:46 -0000 1.6 --- Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.4') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.5') |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 09:35:40
|
Update of /cvsroot/ccmtools/cpp-environment/ccm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13188/ccm Modified Files: Confix2.pkg Log Message: Moved to version number 0.8.5 Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/Confix2.pkg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Confix2.pkg 15 Jan 2007 15:01:46 -0000 1.6 --- Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.4') --- 1,2 ---- PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.5') |
|
From: Teiniker E. <tei...@us...> - 2007-01-19 09:35:40
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13188/ccm/remote Modified Files: Confix2.pkg Log Message: Moved to version number 0.8.5 Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/Confix2.pkg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Confix2.pkg 15 Jan 2007 15:01:46 -0000 1.6 --- Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 *************** *** 1,2 **** PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.4') --- 1,2 ---- PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.5') |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:35
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/literal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/literal Modified Files: LiteralTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: LiteralTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/literal/LiteralTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LiteralTest.java 8 Nov 2006 10:31:46 -0000 1.1 --- LiteralTest.java 18 Jan 2007 17:11:56 -0000 1.2 *************** *** 8,12 **** import ccmtools.metamodel.BaseIDL.MConstantDef; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 8,12 ---- import ccmtools.metamodel.BaseIDL.MConstantDef; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 36,40 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); MConstantDef constant = (MConstantDef)modelElements.get(0); --- 36,40 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); MConstantDef constant = (MConstantDef)modelElements.get(0); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:33
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/home Modified Files: HomeTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: HomeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home/HomeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HomeTest.java 9 Nov 2006 19:16:59 -0000 1.1 --- HomeTest.java 18 Jan 2007 17:11:57 -0000 1.2 *************** *** 10,14 **** import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 10,14 ---- import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.metamodel.ComponentIDL.MHomeDef; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 36,40 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 36,40 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 46,50 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 46,50 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:33
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/module Modified Files: ModuleTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: ModuleTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/module/ModuleTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModuleTest.java 24 Nov 2006 14:48:17 -0000 1.2 --- ModuleTest.java 18 Jan 2007 17:11:57 -0000 1.3 *************** *** 12,16 **** import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.metamodel.BaseIDL.MModuleDef; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 12,16 ---- import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.metamodel.BaseIDL.MModuleDef; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 35,39 **** UserInterfaceDriver uiDriver= new ConsoleDriver(); System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 35,39 ---- UserInterfaceDriver uiDriver= new ConsoleDriver(); System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 46,50 **** UserInterfaceDriver uiDriver= new ConsoleDriver(); System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 46,50 ---- UserInterfaceDriver uiDriver= new ConsoleDriver(); System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); *************** *** 65,69 **** UserInterfaceDriver uiDriver = new ConsoleDriver(); System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List<MModuleDef> result = new ArrayList<MModuleDef>(); --- 65,69 ---- UserInterfaceDriver uiDriver = new ConsoleDriver(); System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List<MModuleDef> result = new ArrayList<MModuleDef>(); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:33
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src/ccmtools/parser/idl Modified Files: ParserHelper.java idlscanner.flex Added Files: ParserManager.java Log Message: Refactored IDL parser to support different PreProcessor implementations --- NEW FILE: ParserManager.java --- package ccmtools.parser.idl; import java.io.File; import java.io.FileReader; import java.io.StringReader; import java.util.List; import ccmtools.CcmtoolsException; import ccmtools.metamodel.BaseIDL.MContainer; import ccmtools.parser.cpp.CppManager; import ccmtools.ui.UserInterfaceDriver; public class ParserManager { public static MContainer loadCcmModel(UserInterfaceDriver uiDriver, String idlSource) throws CcmtoolsException { try { uiDriver.printMessage("parse"); ParserHelper.getInstance().init(); IdlScanner scanner = new IdlScanner(new StringReader(idlSource)); IdlParser parser = new IdlParser(scanner); MContainer ccmModel = (MContainer) parser.parse().value; uiDriver.printMessage("done"); return ccmModel; } catch (Exception e) { e.printStackTrace(); throw new CcmtoolsException(e.getMessage()); } } public static MContainer loadCcmModel(UserInterfaceDriver uiDriver, String idlFileName, List<String> includePaths) throws CcmtoolsException { try { CppManager.createCpp().process(uiDriver, idlFileName, includePaths); MContainer ccmModel = parseIdlFile(uiDriver, idlFileName); return ccmModel; } catch (Exception e) { throw new CcmtoolsException(e.getMessage()); } } public static MContainer parseIdlFile(UserInterfaceDriver uiDriver, String idlFileName) throws CcmtoolsException { try { File idlFile = new File(idlFileName); File tmpIdlFile = new File(idlFileName + ".tmp"); tmpIdlFile.deleteOnExit(); uiDriver.printMessage("use JFlex&Cup based IDL parser"); ParserHelper.getInstance().init(); ParserHelper.getInstance().setMainSourceFile(idlFile.getAbsolutePath()); IdlScanner scanner = new IdlScanner(new FileReader(tmpIdlFile)); IdlParser parser = new IdlParser(scanner); MContainer ccmModel = (MContainer) parser.parse().value; String identifier = idlFileName.substring(0, idlFileName.lastIndexOf(".idl")); ccmModel.setIdentifier(identifier); uiDriver.printMessage("done"); return ccmModel; } catch (Exception e) { throw new CcmtoolsException(e.getMessage()); } } public static void reportError(String message) { StringBuilder out = new StringBuilder(); out.append("ERROR [IDL parser]: "); out.append(message); throw new RuntimeException(out.toString()); } } Index: ParserHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ParserHelper.java 15 Jan 2007 15:00:15 -0000 1.41 --- ParserHelper.java 18 Jan 2007 17:11:48 -0000 1.42 *************** *** 1,10 **** package ccmtools.parser.idl; - import java.io.BufferedReader; - import java.io.File; - import java.io.FileReader; - import java.io.FileWriter; - import java.io.InputStreamReader; - import java.io.StringReader; import java.math.BigInteger; import java.util.ArrayList; --- 1,4 ---- *************** *** 15,20 **** import java_cup.runtime.Symbol; - import ccmtools.CcmtoolsException; - import ccmtools.Constants; import ccmtools.metamodel.BaseIDL.MAliasDef; import ccmtools.metamodel.BaseIDL.MAliasDefImpl; --- 9,12 ---- *************** *** 81,86 **** import ccmtools.metamodel.ComponentIDL.MUsesDef; import ccmtools.metamodel.ComponentIDL.MUsesDefImpl; - import ccmtools.ui.UserInterfaceDriver; - import ccmtools.utils.ConfigurationLocator; import ccmtools.utils.Text; --- 73,76 ---- *************** *** 2281,2284 **** --- 2271,2277 ---- // # 1 "/home/eteinik/sandbox/workspace-development/TelegramGenerator/examples/simple_test/example1.tgen" // # 30 "/home/eteinik/sandbox/workspace-development/ccmtools/test/JavaLocalComponents/component_mirror/xxx/idl3/component/world/Test.idl" + + // #line 1 "c:\\temp\\Message.idl" + public void handlePreprocessorLine(String line) { *************** *** 2365,2489 **** return in.substring(in.indexOf('"')+1, in.lastIndexOf('"')); } - - public MContainer loadCcmModel(UserInterfaceDriver uiDriver, String idlSource) - throws CcmtoolsException - { - try - { - uiDriver.printMessage("parse"); - ParserHelper.getInstance().init(); - IdlScanner scanner = new IdlScanner(new StringReader(idlSource)); - IdlParser parser = new IdlParser(scanner); - MContainer ccmModel = (MContainer) parser.parse().value; - uiDriver.printMessage("done"); - return ccmModel; - } - catch (Exception e) - { - e.printStackTrace(); - throw new CcmtoolsException(e.getMessage()); - } - } - - - public MContainer loadCcmModel(UserInterfaceDriver uiDriver, String idlFileName, List<String> includePaths) - throws CcmtoolsException - { - try - { - uiDriver.printMessage("Use JFlex&Cup based IDL parser"); - File idlFile = new File(idlFileName); - String tmpFileName = idlFile.getName() + ".tmp"; - File tmpIdlFile = new File(tmpFileName); - tmpIdlFile.deleteOnExit(); - - useCpp(uiDriver, idlFile.getAbsolutePath(), includePaths, tmpFileName); - - uiDriver.printMessage("parse " + tmpFileName); - ParserHelper.getInstance().init(); - ParserHelper.getInstance().setMainSourceFile(idlFile.getAbsolutePath()); - IdlScanner scanner = new IdlScanner(new FileReader(tmpIdlFile)); - IdlParser parser = new IdlParser(scanner); - MContainer ccmModel = (MContainer)parser.parse().value; - - String identifier = idlFileName.substring(0, idlFileName.lastIndexOf(".idl")); - ccmModel.setIdentifier(identifier); - getLogger().fine("CCM Model = " + ccmModel); - uiDriver.printMessage("done"); - - //!!!!!!!!!!! - // XStream xstream = new XStream(); - // String xml = xstream.toXML(ccmModel); - // System.out.println(xml); - //!!!!!!!!!!! - return ccmModel; - } - catch (Exception e) - { - throw new CcmtoolsException(e.getMessage()); - } - } - - private void useCpp(UserInterfaceDriver uiDriver, String sourceFileName, List<String> includes, String tmpFileName) - throws CcmtoolsException - { - File tmpFile = new File(System.getProperty("user.dir"), tmpFileName); - try - { - // Run a C preprocessor on the input file, in a separate process. - StringBuffer cmd = new StringBuffer(); - if (ConfigurationLocator.getInstance().get("ccmtools.cpp").length() != 0) - { - cmd.append(ConfigurationLocator.getInstance().get("ccmtools.cpp")); - } - else - { - cmd.append(Constants.CPP_PATH); - } - cmd.append(" "); - for (String includePath : includes) - { - cmd.append("-I").append(includePath).append(" "); - } - cmd.append(sourceFileName); - uiDriver.printMessage(cmd.toString()); // print cpp command line - - Process preproc = Runtime.getRuntime().exec(cmd.toString()); - BufferedReader stdInput = new BufferedReader(new InputStreamReader(preproc.getInputStream())); - BufferedReader stdError = new BufferedReader(new InputStreamReader(preproc.getErrorStream())); - - // Read the output and any errors from the command - String s; - StringBuffer code = new StringBuffer(); - while ((s = stdInput.readLine()) != null) - { - code.append(s).append("\n"); - } - while ((s = stdError.readLine()) != null) - { - uiDriver.printMessage(s); - } - - // Wait for the process to complete and evaluate the return - // value of the attempted command - preproc.waitFor(); - if (preproc.exitValue() != 0) - { - reportError("Preprocessor Error: Please verify your include paths or file names (" - + sourceFileName + ")!!"); - } - else - { - FileWriter writer = new FileWriter(tmpFile); - writer.write(code.toString(), 0, code.toString().length()); - writer.close(); - } - // tmpFile.deleteOnExit(); - } - catch (Exception e) - { - throw new CcmtoolsException(e.getMessage()); - } - } - } --- 2358,2360 ---- Index: idlscanner.flex =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/idlscanner.flex,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** idlscanner.flex 21 Sep 2006 15:33:26 -0000 1.3 --- idlscanner.flex 18 Jan 2007 17:11:49 -0000 1.4 *************** *** 44,48 **** PreprocessorLine = "#" {InputCharacter}* {LineTerminator} PragmaLine = "#pragma" {InputCharacter}* {LineTerminator} ! EndOfLineComment = "//" {InputCharacter}* {LineTerminator} Digits = [0-9]+ --- 44,55 ---- PreprocessorLine = "#" {InputCharacter}* {LineTerminator} PragmaLine = "#pragma" {InputCharacter}* {LineTerminator} ! ! Comment = {TraditionalComment} | {EndOfLineComment} | {DocumentationComment} ! TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/" ! EndOfLineComment = "//" {InputCharacter}* {LineTerminator} ! DocumentationComment = "/**" {CommentContent} "*"+ "/" ! CommentContent = ( [^*] | \*+ [^/*] )* ! ! Digits = [0-9]+ *************** *** 87,91 **** {WhiteSpace} { /* no actions*/ } ! {EndOfLineComment} { /* no actions*/ } {LineTerminator} { --- 94,98 ---- {WhiteSpace} { /* no actions*/ } ! {Comment} { /* no actions*/ } {LineTerminator} { |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:32
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/include_nested In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/test/CppGenerator/include_nested Modified Files: Console.idl Added Files: .cvsignore Log Message: Refactored IDL parser to support different PreProcessor implementations --- NEW FILE: .cvsignore --- Hello.idl.tmp preprocessedFile.idl Index: Console.idl =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/include_nested/Console.idl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Console.idl 19 Nov 2003 01:25:44 -0000 1.1 --- Console.idl 18 Jan 2007 17:11:56 -0000 1.2 *************** *** 6,10 **** ! #include"Message.idl" interface Console { --- 6,10 ---- ! #include "Message.idl" interface Console { |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:31
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src/ccmtools/generator/idl Modified Files: Main.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/Main.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Main.java 18 Dec 2006 21:34:19 -0000 1.9 --- Main.java 18 Jan 2007 17:11:51 -0000 1.10 *************** *** 18,22 **** import ccmtools.generator.idl.metamodel.ModelRepository; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 18,22 ---- import ccmtools.generator.idl.metamodel.ModelRepository; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; *************** *** 63,68 **** { String idlFile = (String) i.next(); ! MContainer ccmModel = ! ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); // Transform CCM Model to IDL Implementation Model --- 63,67 ---- { String idlFile = (String) i.next(); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); // Transform CCM Model to IDL Implementation Model *************** *** 84,88 **** catch (ParseException e) { - e.printStackTrace(); uiDriver.printError(e.getMessage()); printUsage(); --- 83,86 ---- *************** *** 90,94 **** catch (CcmtoolsException e) { - // e.printStackTrace(); exitWithErrorStatus(e.getMessage()); } --- 88,91 ---- *************** *** 100,104 **** catch (Exception e) { - e.printStackTrace(); exitWithErrorStatus(e.getMessage()); } --- 97,100 ---- |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:31
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/enumeration In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/enumeration Modified Files: EnumTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: EnumTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/enumeration/EnumTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EnumTest.java 8 Nov 2006 10:31:43 -0000 1.1 --- EnumTest.java 18 Jan 2007 17:11:55 -0000 1.2 *************** *** 10,14 **** import ccmtools.metamodel.BaseIDL.MIDLType; import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 10,14 ---- import ccmtools.metamodel.BaseIDL.MIDLType; import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 68,72 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 68,72 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:30
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/valuetype Modified Files: ValuetypeTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: ValuetypeTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/valuetype/ValuetypeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuetypeTest.java 8 Nov 2006 10:31:34 -0000 1.1 --- ValuetypeTest.java 18 Jan 2007 17:11:52 -0000 1.2 *************** *** 20,24 **** import ccmtools.metamodel.BaseIDL.MValueMemberDef; import ccmtools.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 20,24 ---- import ccmtools.metamodel.BaseIDL.MValueMemberDef; import ccmtools.metamodel.ComponentIDL.MFactoryDef; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 36,40 **** uiDriver = new ConsoleDriver(); } - --- 36,39 ---- *************** *** 85,89 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 84,88 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); *************** *** 102,106 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 101,105 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 112,116 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 111,115 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 122,126 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 121,125 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:29
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/sequence Modified Files: SequenceTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: SequenceTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/SequenceTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SequenceTest.java 8 Nov 2006 10:31:39 -0000 1.1 --- SequenceTest.java 18 Jan 2007 17:11:50 -0000 1.2 *************** *** 11,15 **** import ccmtools.metamodel.BaseIDL.MSequenceDef; import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; --- 11,15 ---- import ccmtools.metamodel.BaseIDL.MSequenceDef; import ccmtools.metamodel.BaseIDL.MTyped; ! import ccmtools.parser.idl.ParserManager; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; *************** *** 80,84 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 80,84 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:29
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/notsupported In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/notsupported Modified Files: NotSupportedTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: NotSupportedTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/notsupported/NotSupportedTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NotSupportedTest.java 8 Nov 2006 10:31:55 -0000 1.1 --- NotSupportedTest.java 18 Jan 2007 17:11:52 -0000 1.2 *************** *** 9,13 **** import ccmtools.CcmtoolsException; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 9,13 ---- import ccmtools.CcmtoolsException; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 71,75 **** { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 71,75 ---- { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:28
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src/ccmtools/generator/java Modified Files: Main.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/Main.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Main.java 15 Jan 2007 16:42:24 -0000 1.7 --- Main.java 18 Jan 2007 17:11:46 -0000 1.8 *************** *** 18,22 **** import ccmtools.generator.java.metamodel.ModelRepository; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 18,22 ---- import ccmtools.generator.java.metamodel.ModelRepository; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; *************** *** 64,69 **** { String idlFile = (String) i.next(); ! MContainer ccmModel = ! ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); // Transform CCM Model to Java Implementation Model --- 64,68 ---- { String idlFile = (String) i.next(); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); // Transform CCM Model to Java Implementation Model |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:27
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/typedef Modified Files: TypedefTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: TypedefTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TypedefTest.java 8 Nov 2006 10:31:45 -0000 1.1 --- TypedefTest.java 18 Jan 2007 17:11:47 -0000 1.2 *************** *** 8,12 **** import ccmtools.metamodel.BaseIDL.MAliasDef; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 8,12 ---- import ccmtools.metamodel.BaseIDL.MAliasDef; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 33,37 **** { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 33,37 ---- { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); |
|
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); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:27
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src/ccmtools/metamodel Modified Files: Main.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel/Main.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Main.java 18 Dec 2006 21:34:19 -0000 1.10 --- Main.java 18 Jan 2007 17:11:47 -0000 1.11 *************** *** 14,18 **** import ccmtools.CcmtoolsException; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; --- 14,18 ---- import ccmtools.CcmtoolsException; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; *************** *** 65,69 **** for (String idlFile : parameters.getIdlFiles()) { ! ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); } } --- 65,69 ---- for (String idlFile : parameters.getIdlFiles()) { ! ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); } } *************** *** 84,88 **** { MContainer ccmModel = ! ParserHelper.getInstance().loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); CcmModelValidator validator = new CcmModelValidator(uiDriver, parameters); if(!validator.isValidModel(ccmModel)) --- 84,88 ---- { MContainer ccmModel = ! ParserManager.loadCcmModel(uiDriver, idlFile, parameters.getIncludePaths()); CcmModelValidator validator = new CcmModelValidator(uiDriver, parameters); if(!validator.isValidModel(ccmModel)) |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:24
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/union In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/union Modified Files: UnionTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: UnionTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/union/UnionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UnionTest.java 8 Nov 2006 10:31:53 -0000 1.1 --- UnionTest.java 18 Jan 2007 17:11:47 -0000 1.2 *************** *** 15,19 **** import ccmtools.metamodel.BaseIDL.MUnionDef; import ccmtools.metamodel.BaseIDL.MUnionFieldDef; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; --- 15,19 ---- import ccmtools.metamodel.BaseIDL.MUnionDef; import ccmtools.metamodel.BaseIDL.MUnionFieldDef; ! import ccmtools.parser.idl.ParserManager; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; *************** *** 83,87 **** { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 83,87 ---- { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 92,96 **** { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 92,96 ---- { System.out.println("[" + sourceLine + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceLine); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:10
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/array Modified Files: ArrayTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: ArrayTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/array/ArrayTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrayTest.java 8 Nov 2006 10:31:33 -0000 1.1 --- ArrayTest.java 18 Jan 2007 17:11:58 -0000 1.2 *************** *** 8,12 **** import ccmtools.metamodel.BaseIDL.MAliasDef; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; --- 8,12 ---- import ccmtools.metamodel.BaseIDL.MAliasDef; import ccmtools.metamodel.BaseIDL.MContainer; ! import ccmtools.parser.idl.ParserManager; import ccmtools.ui.ConsoleDriver; import ccmtools.ui.UserInterfaceDriver; *************** *** 33,37 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 33,37 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); |
|
From: Teiniker E. <tei...@us...> - 2007-01-18 17:12:08
|
Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/iface Modified Files: InterfaceTest.java Log Message: Refactored IDL parser to support different PreProcessor implementations Index: InterfaceTest.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InterfaceTest.java 8 Nov 2006 10:31:32 -0000 1.1 --- InterfaceTest.java 18 Jan 2007 17:11:59 -0000 1.2 *************** *** 14,18 **** import ccmtools.metamodel.BaseIDL.MParameterDef; import ccmtools.metamodel.BaseIDL.MParameterMode; ! import ccmtools.parser.idl.ParserHelper; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; --- 14,18 ---- import ccmtools.metamodel.BaseIDL.MParameterDef; import ccmtools.metamodel.BaseIDL.MParameterMode; ! import ccmtools.parser.idl.ParserManager; import ccmtools.parser.idl.primitive.PrimitiveTest; import ccmtools.ui.ConsoleDriver; *************** *** 75,79 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); --- 75,79 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println(modelElements); *************** *** 85,89 **** { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); --- 85,89 ---- { System.out.println("[" + sourceCode + "]"); ! MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode); List modelElements = ccmModel.getContentss(); System.out.println("#" + modelElements.size() + ": " + modelElements); |
1 message has been excluded from this view by a project administrator.
