[ccmtools-cvs] ccmtools/src/ccmtools/parser/idl ParserHelper.java, 1.43, 1.44 ParserManager.java, 1.2, 1.3

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25149/src/ccmtools/parser/idl

Modified Files:
	ParserHelper.java ParserManager.java 
Log Message:
Added support for windows cl preprocessor. 

Index: ParserManager.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ParserManager.java	19 Jan 2007 12:06:52 -0000	1.2
--- ParserManager.java	22 Jan 2007 13:05:13 -0000	1.3
***************
*** 49,63 ****
      }
  
!     
      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());
--- 49,71 ----
      }
  
! 
      public static MContainer parseIdlFile(UserInterfaceDriver uiDriver, String idlFileName)
          throws CcmtoolsException
      {
+         return  parseIdlFile(uiDriver,idlFileName, true);
+     }
+     
+     public static MContainer parseIdlFile(UserInterfaceDriver uiDriver, String idlFileName, boolean deleteOnExit)
+         throws CcmtoolsException
+     {
          try
          {
              File idlFile = new File(idlFileName);
              File tmpIdlFile = new File(idlFileName + ".tmp");
!             if(deleteOnExit)
!             {
!                 tmpIdlFile.deleteOnExit();
!             }
!             uiDriver.printMessage("use JFlex&Cup based IDL parser: " + tmpIdlFile);
              ParserHelper.getInstance().init();
              ParserHelper.getInstance().setMainSourceFile(idlFile.getAbsolutePath());

Index: ParserHelper.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** ParserHelper.java	19 Jan 2007 12:06:51 -0000	1.43
--- ParserHelper.java	22 Jan 2007 13:05:13 -0000	1.44
***************
*** 2241,2245 ****
      {
          getLogger().fine("131: factory " + id + " ( "+ parameters + " ) " + exceptions);
- //        if(parameters == null) parameters = new ArrayList();
          
          MFactoryDef factory = new MFactoryDefImpl();
--- 2241,2244 ----
***************
*** 2279,2283 ****
          line = line.substring(0, line.lastIndexOf('\n'));
          String[] elements = line.split(" ");
!         if (elements[0].equals("#"))
          {
              if (elements.length >= 3)
--- 2278,2283 ----
          line = line.substring(0, line.lastIndexOf('\n'));
          String[] elements = line.split(" ");
!         
!         if (elements[0].equals("#") || elements[0].equals("#line"))
          {
              if (elements.length >= 3)