ANT Contrib

Marcel wrote:
>>
>>  Stupid late night index variable mismatches
>>
>>Could you please commit this fix?

Will do tonight.


>>3) On linking you should never use 'ld' directly, use
>>'gcc' instead (using ld can lead to subtle runtime bugs on Linux).

Thanks for the pointer.  I'll still use ld for the version info, but I'll
use gcc for the link step.  Any <linkerarg>, I'll auto-decorate with "-Wl,".

>>4) There is no gap allowed after -l
>>
>>
>>   so we can choose e.g.
>>
>>     sep[0]=""; sep[1]="="; and sep[2]=" "; ..,

The Ant Execute task will wrap any command line argument with an embedded
space in quotes to take care of scenarios where there is a path name with
spaces.  There isn't a clean way around it, so if you want a space between
"-L" and directory name, you need to pass them as two successive command
line arguments.

>>5) The
>>
>>   <syslibset dir="/lib" libs="dl"/>
>>
>>should not force to set a dir attribute,
>>"dl" is at a well known place /lib/libdl.so
>>which we schould not need to take care of.

The intention was that you could leave off the dir attribute and it would be
found on the appropriate lib search path.  I believe it was working properly
on the other compilers, was it throwing a BuildException for you.

I'm going to have to call it a night.  I was hoping to take at least one =
shot on Linux after finishing off today's efforts, but am running out of =
steam.

<syslibset> and <libset> now only support a libs and an optional dir =
attribute.   For GCC, this should translate directly into a =
corresponding -l and possibly -L command line argument.  For VC/BCC, it =
will attempt to locate a corresponding .lib and add it to the file list.

<syslibset> will not use the timestamp of the matching file in =
dependency checking.  Other than that, they should behave identically.

Marcel, I'll let you play with the appropriate ld options ("-rpath", =
etc) to get the behavior that you desire.  Hopefully what is in there is =
close and it should be obvious where you can make changes in GccLinker.

I've added a location attribute to compilerarg and linkerarg so you can =
specify whether the arg should go at the "start" of the command line =
(just after the exe name), just before the files ("mid") or at the "end"

The CC task now has a "runtime" attribute with allowable values =
"dynamic" or "static".  The value is used, along with multithread, debug =
and link, to determine the appropriate /M flags for VC.  Unsupported =
combinations (for example, statically-linked multithreaded C RTL) will =
throw a BuildException.

I've added a compiler implementation for Compaq Visual Fortran =
(originally Digital Visual Fortran) for Windows.  test/build.xml will =
build an equivalent to the C examples.  It isn't surprising that the =
"test1" target doesn't build (the one that uses a shared and a static =
library) on Windows, since there aren't any .def files or =
dllexport/dllimport directives.

Any notes on using command line Ant from Cygwin?  I've been doing all my =
testing from JBuilder under Cygwin and tried invoking it from the =
command line didn't get it in the first few attempts.

I did add a "xdocs" target that will run proposal/xdocs/build.xml on =
cpptasks.  I posted a message on ant-dev to see if anyone had the =
missing pieces for using it to prepare the cpptask documentation.  If =
you want to run it, you will need to edit cpptask's build or specify a =
command line property to set the xdocs.dir (or something like that) to =
your Ant snapshot.

Later.

Update of /cvsroot/ant-contrib/cpptasks/samples
In directory usw-pr-cvs1:/tmp/cvs-serv7442

Modified Files:
	xercesc.ant 
Log Message:
syslibset changes

Index: xercesc.ant
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/samples/xercesc.ant,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** xercesc.ant	10 Apr 2002 04:34:32 -0000	1.11
--- xercesc.ant	11 Apr 2002 06:01:13 -0000	1.12
***************
*** 62,66 ****
    <property name="version" value="1.5"/>
  
!   <property name="compiler" value="VC6"/>
    <property name="debug" value="true" />
    <property name="chmod.fail" value="true" />
--- 62,66 ----
    <property name="version" value="1.5"/>
  
!   <property name="compiler" value="gcc"/>
    <property name="debug" value="true" />
    <property name="chmod.fail" value="true" />
***************
*** 89,94 ****
--- 89,99 ----
    -->
  
+   <!--
    <taskdef resource="cpptasks.tasks"/>
    <typedef resource="cpptasks.types"/>
+   -->
+   <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
+   <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
+   <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
  
  
***************
*** 923,929 ****
  			<define name="PLATFORM_WIN32" if="windows"/>
  		</defineset>   
! 		<syslibset caseSensitive="false">
! 			<include name="WININET.LIB"/>
! 		</syslibset>
  	</cc>
    </target>
--- 928,932 ----
  			<define name="PLATFORM_WIN32" if="windows"/>
  		</defineset>   
! 		<syslibset libs="wininet"/>
  	</cc>
    </target>

Update of /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv7179/junit/net/sf/antcontrib/cpptasks/compiler

Modified Files:
	TestAbstractCompiler.java TestAbstractLinker.java 
	TestAbstractProcessor.java 
	TestCommandLineCompilerConfiguration.java 
Log Message:
Fortran stuff

Index: TestAbstractCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractCompiler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestAbstractCompiler.java	8 Apr 2002 17:56:06 -0000	1.4
--- TestAbstractCompiler.java	11 Apr 2002 06:00:44 -0000	1.5
***************
*** 66,69 ****
--- 66,71 ----
  import net.sf.antcontrib.cpptasks.gcc.GccCCompiler;
  import net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler;
+ import net.sf.antcontrib.cpptasks.parser.Parser;
+ import net.sf.antcontrib.cpptasks.parser.CParser;
  
  
***************
*** 99,103 ****
          }
  
!         public CompilerConfiguration createConfiguration(ProcessorDef[] def1, CompilerDef def2) {
            return null;
          }
--- 101,106 ----
          }
  
!         public CompilerConfiguration createConfiguration(
!             CCTask task, ProcessorDef[] def1, CompilerDef def2) {
            return null;
          }

Index: TestAbstractLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractLinker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestAbstractLinker.java	10 Apr 2002 04:31:54 -0000	1.4
--- TestAbstractLinker.java	11 Apr 2002 06:00:44 -0000	1.5
***************
*** 90,94 ****
  
  
!         public LinkerConfiguration createConfiguration(ProcessorDef[] def1, LinkerDef def2) {
            return null;
          }
--- 90,94 ----
  
  
!         public LinkerConfiguration createConfiguration(CCTask task, ProcessorDef[] def1, LinkerDef def2) {
            return null;
          }
***************
*** 117,125 ****
          public String getOutputFileName(String sourceFile) {
            return null;
-         }
- 
-         public LinkerConfiguration createConfiguration(LinkerDef defaultProvider,
-             LinkerDef specificProvider) {
-             return null;
          }
  
--- 117,120 ----

Index: TestAbstractProcessor.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestAbstractProcessor.java	8 Apr 2002 17:54:27 -0000	1.3
--- TestAbstractProcessor.java	11 Apr 2002 06:00:44 -0000	1.4
***************
*** 106,110 ****
          }
  
!         public ProcessorConfiguration createConfiguration(ProcessorDef[] defaultProvider,
              ProcessorDef specificProvider) {
              return null;
--- 106,111 ----
          }
  
!         public ProcessorConfiguration createConfiguration(
!           CCTask task, ProcessorDef[] defaultProvider,
              ProcessorDef specificProvider) {
              return null;

Index: TestCommandLineCompilerConfiguration.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler/TestCommandLineCompilerConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCommandLineCompilerConfiguration.java	17 Mar 2002 01:58:11 -0000	1.1
--- TestCommandLineCompilerConfiguration.java	11 Apr 2002 06:00:44 -0000	1.2
***************
*** 84,88 ****
            new CommandLineCompilerConfiguration(null, "dummy",
            new File[0], new File[0], new File[0], "",
!           new String[0],false, new String[2][0]);
            fail("Should throw exception for null compiler");
          }
--- 84,88 ----
            new CommandLineCompilerConfiguration(null, "dummy",
            new File[0], new File[0], new File[0], "",
!           new String[0],false, new String[2][0], new String[0]);
            fail("Should throw exception for null compiler");
          }
***************
*** 99,103 ****
            "dummy",
            new File[0], new File[0], new File[0], "",
!           new String[] { "/Id:/gcc" },false, new String[2][0]);
       }
  
--- 99,103 ----
            "dummy",
            new File[0], new File[0], new File[0], "",
!           new String[] { "/Id:/gcc" },false, new String[2][0], new String[0]);
       }

Update of /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks
In directory usw-pr-cvs1:/tmp/cvs-serv7179/junit/net/sf/antcontrib/cpptasks

Modified Files:
	TestCCTask.java 
Log Message:
Fortran stuff

Index: TestCCTask.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/TestCCTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestCCTask.java	10 Apr 2002 04:31:54 -0000	1.4
--- TestCCTask.java	11 Apr 2002 06:00:44 -0000	1.5
***************
*** 86,90 ****
              "dummy",
              new File[0], new File[0],new File[0], "",
!             new String[0], true, new String[2][0]);
          TargetInfo target1 = new TargetInfo(config1,
            new File[] { new File("src/foo.bar") }, null, new File("foo.obj"),true);
--- 86,90 ----
              "dummy",
              new File[0], new File[0],new File[0], "",
!             new String[0], true, new String[2][0], new String[0]);
          TargetInfo target1 = new TargetInfo(config1,
            new File[] { new File("src/foo.bar") }, null, new File("foo.obj"),true);
***************
*** 105,109 ****
              "dummy",
              new File[0], new File[0], new File[0],"",
!             new String[0], false, new String[2][0]);
          //
          //    target doesn't need to be rebuilt
--- 105,109 ----
              "dummy",
              new File[0], new File[0], new File[0],"",
!             new String[0], false, new String[2][0], new String[0]);
          //
          //    target doesn't need to be rebuilt

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/testapp
In directory usw-pr-cvs1:/tmp/cvs-serv7179/f-src/testapp

Added Files:
	testapp.for 
Log Message:
Fortran stuff

--- NEW FILE: testapp.for ---
	  INCLUDE 'TESTAPP.INC'
	  PROGRAM TESTAPP
       INTERFACE
	      SUBROUTINE TESTFUNCSHARED(MSG)
		  CHARACTER*(*) MSG
!DEC$ ATTRIBUTES DLLIMPORT :: TESTFUNCSHARED
		  END SUBROUTINE TESTFUNCSHARED
	   END INTERFACE	  CALL TESTFUNCSTATIC('method from static library')
	  CALL TESTFUNCSTATIC2('method2 from static library')
	  CALL TESTFUNCSHARED('method from shared library')
	  END

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/lib_static
In directory usw-pr-cvs1:/tmp/cvs-serv7179/f-src/lib_static

Added Files:
	test_static.for test_static2.for 
Log Message:
Fortran stuff

--- NEW FILE: test_static.for ---
      INCLUDE 'TESTAPP.INC'
	  SUBROUTINE TESTFUNCSTATIC(MSG)
	  CHARACTER*(*) MSG 
	  PRINT*, "TESTFUNCSTATIC():"
	  PRINT*, MSG
	  RETURN
	  END


--- NEW FILE: test_static2.for ---
       INCLUDE 'TESTAPP.INC'
	   SUBROUTINE TESTFUNCSTATIC2(MSG)
	   CHARACTER*(*) MSG
	   PRINT*, "TESTFUNCSTATIC2():"
	   PRINT*, MSG
	   RETURN
	   END

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/include
In directory usw-pr-cvs1:/tmp/cvs-serv7179/f-src/include

Added Files:
	testapp.inc 
Log Message:
Fortran stuff

--- NEW FILE: testapp.inc ---
C
C
C       Some comments
C
C

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/lib_shared
In directory usw-pr-cvs1:/tmp/cvs-serv7179/f-src/lib_shared

Added Files:
	test_shared.def test_shared.for test_shared.inc 
Log Message:
Fortran stuff

--- NEW FILE: test_shared.def ---
EXPORTS
_TESTFUNCSHARED@...
--- NEW FILE: test_shared.for ---
      INCLUDE 'TESTAPP.INC'
	  INCLUDE 'TEST_SHARED.INC'
      SUBROUTINE TESTFUNCSHARED(MSG)
	  CHARACTER*(*) MSG
	  PRINT*, "TESTFUNCSHARE(): "
	  PRINT*, MSG
	  RETURN
	  END


--- NEW FILE: test_shared.inc ---
C                 An empty header file.

Update of /cvsroot/ant-contrib/cpptasks/test
In directory usw-pr-cvs1:/tmp/cvs-serv7179

Modified Files:
	build.xml 
Log Message:
Fortran stuff

Index: build.xml
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml	9 Apr 2002 06:50:42 -0000	1.6
--- build.xml	11 Apr 2002 06:00:43 -0000	1.7
***************
*** 11,14 ****
--- 11,16 ----
  	<!-- property name="use-bcc"/  -->
  
+     <property name="use-df" value=""/>
+ 
  
      <!-- <property name="libtool" value="true"/> -->
***************
*** 94,96 ****
--- 96,178 ----
          </cc>
      </target>
+ 
+     <target name="fortran-all" depends="init, fortran1, fortran2">
+     </target>
+ 
+     <!-- Compile static lib, shared lib, and executable -->
+     <target name="fortran1">
+ 		<mkdir dir="${build.dir}/fortran1"/>
+         <cc
+                 outfile="${build.dir}/fortran1/static"
+                 link="static"
+                 debug="${debug}" >
+             <compiler name="df" if="use-df">
+                 <defineset define="DLL_IMPORT"/>
+             </compiler>
+             <!-- compiler name="libtool" if="libtool"/ -->
+             <compiler name="gcc" if="use-gcc"/>
+ 			<linker name="df" if="use-df"/>
+             <fileset dir="f-src/lib_static"/>
+             <includepath location="f-src/include"/>
+         </cc>
+ 
+ 		<property name="deffile" location="f-src\lib_shared\test_shared.def"/>
+ 
+         <cc
+                 outfile="${build.dir}/fortran1/shared"
+                 link="shared"
+                 debug="${debug}">
+             <compiler name="df" if="use-df">
+                 <defineset define="DLL_EXPORT"/>
+             </compiler>
+             <!-- compiler name="libtool" if="libtool"/ -->
+             <compiler name="gcc" if="use-gcc"/>
+ 			<linker name="df" if="use-df">
+ 				<linkerarg value="/DEF:${deffile}" location="mid"/>
+ 			</linker> 
+             <fileset dir="f-src/lib_shared" includes="*.for"/>
+             <includepath location="f-src/include"/>
+         </cc>
+ 
+         <cc
+                 outfile="${build.dir}/fortran1/testapp"
+                 link="executable"
+                 debug="${debug}">
+             <compiler name="df" if="use-df">
+                 <defineset define="DLL_EXPORT"/>
+             </compiler>
+             <!-- compiler name="libtool" if="libtool"/ -->
+             <compiler name="gcc" if="use-gcc"/>
+ 			<linker name="df" if="use-df"/>
+             <fileset dir="f-src/testapp"/>
+ 			<fileset dir="${build.dir}/fortran1">
+ 				<include name="static.lib"/>
+ 				<include name="shared.dll"/>
+ 			</fileset>
+ 
+             <includepath location="f-src/include"/>
+             <!-- libset libs="shared">
+                 <libpath location="${build.dir}/test1"/>
+                 <fileset dir="${build.dir}/test1" includes="**/*static*"/>
+             </libset -->
+         </cc>
+     </target>
+ 
+     <!-- Compile everything as a single executable -->
+     <target name="fortran2">
+ 		<mkdir dir="${build.dir}/fortran2/obj"/>
+         <cc
+                 outfile="${build.dir}/fortran2/testapp"
+                 objdir="${build.dir}/fortran2/obj"
+                 debug="${debug}" >
+             <compiler name="df" if="use-df"/>
+             <!-- compiler name="libtool" if="libtool"/ -->
+             <compiler name="gcc" if="use-gcc"/>
+             <fileset dir="f-src"/>
+             <defineset define="DO_EXTRA_STUFF"/>
+             <includepath location="f-src/include"/>
+ 			<linker name="df" if="use-df"/>
+         </cc>
+     </target>
+ 
  </project>

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/lib_static
In directory usw-pr-cvs1:/tmp/cvs-serv1796/lib_static

Log Message:
Directory /cvsroot/ant-contrib/cpptasks/test/f-src/lib_static added to the repository

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/lib_shared
In directory usw-pr-cvs1:/tmp/cvs-serv1694/lib_shared

Log Message:
Directory /cvsroot/ant-contrib/cpptasks/test/f-src/lib_shared added to the repository

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/parser
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/parser

Added Files:
	AbstractParser.java AbstractParserState.java BranchState.java 
	CParser.java FilenameState.java FortranParser.java 
	LetterState.java Parser.java PostE.java 
	WhitespaceOrLetterState.java 
Log Message:
Fortran stuff

--- NEW FILE: AbstractParser.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import java.io.*;
import java.util.*;
import org.apache.tools.ant.Task;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;

/**
 * An abstract base class for simple parsers
 *
 * @author Curt Arnold
 */
public abstract class AbstractParser
{
    /**
     *
     *
     */
    protected AbstractParser() {
    }

    public abstract AbstractParserState getNewLineState();
    protected abstract void addFilename(String filename);

    protected void parse(Reader reader) throws IOException {
        char[] buf = new char[4096];
        AbstractParserState newLineState = getNewLineState();
        AbstractParserState state = newLineState;

        int charsRead = -1;
        do {
          charsRead = reader.read(buf,0,buf.length);
          if(state == null) {
            for(int i = 0; i < charsRead; i++) {
              if(buf[i] == '\n') {
                state = newLineState;
                break;
              }
            }
          }
          for(int i = 0; i < charsRead; i++) {
            state = state.consume(buf[i]);
            //
            //  didn't match a production, skip to a new line
            //
            if(state == null) {
              for(; i < charsRead; i++) {
                if(buf[i] == '\n') {
                  state = newLineState;
                  break;
                }
              }
            }
          }
        }
        while (charsRead >= 0);
    }


}


--- NEW FILE: AbstractParserState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;

/**
 * An base class for objects that represent the state of an AbstractParser.
 *
 * @author CurtArnold
 * @see AbstractParser
 */
public abstract class AbstractParserState {
  private AbstractParser parser;
  protected AbstractParserState(AbstractParser parser) {
    if(parser == null) {
      throw new NullPointerException("parser");
    }
    this.parser = parser;
  }

  protected AbstractParser getParser() {
    return parser;
  }

  /**
   * Consume a character
   *
   * @return new state, may be null to ignore the rest of the line
   */
  public abstract AbstractParserState consume(char ch);
}


--- NEW FILE: BranchState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;

public abstract class BranchState extends AbstractParserState {
  private char[] branchChars;
  private AbstractParserState[] branchStates;
  private AbstractParserState noMatchState;
  public BranchState(AbstractParser parser, char[] branchChars,
    AbstractParserState[] branchStates) {
    super(parser);
    this.branchChars = (char[]) branchChars.clone();
    this.branchStates = (AbstractParserState[]) branchStates.clone();
  }

  protected abstract AbstractParserState getNoMatchState(char ch);

  public AbstractParserState consume(char ch) {
    for(int i = 0; i < branchChars.length; i++) {
      if(ch == branchChars[i]) {
        return branchStates[i];
      }
    }
    return getNoMatchState(ch);
  }
}

--- NEW FILE: CParser.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import java.io.*;
import java.util.*;
import org.apache.tools.ant.Task;
import net.sf.antcontrib.cpptasks.parser.Parser;
import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
import net.sf.antcontrib.cpptasks.parser.FilenameState;
import net.sf.antcontrib.cpptasks.parser.PostE;
import net.sf.antcontrib.cpptasks.parser.LetterState;
import net.sf.antcontrib.cpptasks.parser.WhitespaceOrLetterState;

/**
 * A parser that extracts #include statements from a Reader.
 *
 * @author Adam Murdoch
 * @author Curt Arnold
 */
public final class CParser extends AbstractParser implements Parser
{
    private AbstractParserState newLineState;
    private final Vector includes = new Vector();


    /**
     *
     *
     */
    public CParser() {
        AbstractParserState quote = new FilenameState(this,new char[] { '"' });
        AbstractParserState bracket = new FilenameState(this,new char[] { '>' });
        AbstractParserState postE = new PostE(this,bracket,quote);
        AbstractParserState e = new LetterState(this,'e',postE,null);
        AbstractParserState d = new LetterState(this,'d',e,null);
        AbstractParserState u = new LetterState(this,'u',d,null);
        AbstractParserState l = new LetterState(this,'l',u,null);
        AbstractParserState c = new LetterState(this,'c',l,null);
        AbstractParserState n = new LetterState(this,'n',c,null);
        AbstractParserState i = new WhitespaceOrLetterState(this,'i',n);
        newLineState = new LetterState(this,'#',i,null);
    }

    public void parse(Reader reader) throws IOException {
        includes.setSize(0);
        super.parse(reader);
    }

    public String[] getIncludes() {
        String[] retval = new String[includes.size()];
        includes.copyInto(retval);
        return retval;
    }


    public void addFilename(String include) {
      includes.addElement(include);
    }

    public AbstractParserState getNewLineState() {
      return newLineState;
    }


}


--- NEW FILE: FilenameState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;

public class FilenameState extends AbstractParserState {
  private final StringBuffer buf = new StringBuffer();
  private final char[] terminators;
  public FilenameState(AbstractParser parser, char[] terminators) {
    super(parser);
    this.terminators = (char[]) terminators.clone();
  }
  public AbstractParserState consume(char ch) {
    for(int i = 0; i < terminators.length; i++) {
      if(ch == terminators[i]) {
        getParser().addFilename(buf.toString());
        buf.setLength(0);
        return null;
      }
    }
    if(ch == '\n') {
      buf.setLength(0);
      return getParser().getNewLineState();
    }
    else {
      buf.append(ch);
    }
    return this;
  }
}


--- NEW FILE: FortranParser.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import java.io.*;
import java.util.*;
import org.apache.tools.ant.Task;
import net.sf.antcontrib.cpptasks.parser.Parser;
import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
import net.sf.antcontrib.cpptasks.parser.FilenameState;
import net.sf.antcontrib.cpptasks.parser.PostE;
import net.sf.antcontrib.cpptasks.parser.LetterState;
import net.sf.antcontrib.cpptasks.parser.WhitespaceOrLetterState;

/**
 * A parser that extracts INCLUDE statements from a Reader.
 *
 * @author Curt Arnold
 */
public final class FortranParser extends AbstractParser implements Parser
{
    private AbstractParserState newLineState;
    private final Vector includes = new Vector();


    /**
     *
     *
     */
    public FortranParser() {
        AbstractParserState filename = new FilenameState(this,new char[] { '\'', '/' });
        AbstractParserState apos = new WhitespaceOrLetterState(this,'\'', filename);
        AbstractParserState blank = new LetterState(this,' ',apos,null);
        AbstractParserState e = new LetterState(this,'E',blank,null);
        AbstractParserState d = new LetterState(this,'D',e,null);
        AbstractParserState u = new LetterState(this,'U',d,null);
        AbstractParserState l = new LetterState(this,'L',u,null);
        AbstractParserState c = new LetterState(this,'C',l,null);
        AbstractParserState n = new LetterState(this,'N',c,null);
        newLineState = new WhitespaceOrLetterState(this,'I',n);
    }

    public void parse(Reader reader) throws IOException {
        includes.setSize(0);
        super.parse(reader);
    }

    public String[] getIncludes() {
        String[] retval = new String[includes.size()];
        includes.copyInto(retval);
        return retval;
    }


    public void addFilename(String include) {
      includes.addElement(include);
    }

    public AbstractParserState getNewLineState() {
      return newLineState;
    }


}


--- NEW FILE: LetterState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;

public final class LetterState extends AbstractParserState {
  protected char thisLetter;
  protected AbstractParserState nextState;
  protected AbstractParserState noMatchState;
  public LetterState(AbstractParser parser,
    char thisLetter,
    AbstractParserState nextState,
    AbstractParserState noMatchState) {
    super(parser);
    this.thisLetter = thisLetter;
    this.nextState = nextState;
    this.noMatchState = noMatchState;
  }
  public AbstractParserState consume(char ch) {
    if(ch == thisLetter) {
      return nextState;
    }
    if(ch == '\n') {
      getParser().getNewLineState();
    }
    return noMatchState;
  }
}


--- NEW FILE: Parser.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import java.io.*;
import java.util.*;
import org.apache.tools.ant.Task;

/**
 * A parser that extracts #include statements from a Reader.
 *
 * @author Curt Arnold
 */
public interface Parser
{
    void parse(Reader reader) throws IOException;
    String[] getIncludes();
}


--- NEW FILE: PostE.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;

public class PostE extends AbstractParserState {
  private AbstractParserState bracket;
  private AbstractParserState quote;
  public PostE(CParser parser, AbstractParserState bracket, AbstractParserState quote) {
    super(parser);
    this.bracket = bracket;
    this.quote = quote;
  }

  public AbstractParserState consume(char ch) {
    switch(ch) {
      case ' ':
      case '\t':
      return this;

      case '<':
      return bracket;

      case '"':
      return quote;

      case '\n':
      return getParser().getNewLineState();
    }
    return null;
  }
}

--- NEW FILE: WhitespaceOrLetterState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.parser;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;



public final class WhitespaceOrLetterState extends AbstractParserState {
  protected final char thisLetter;
  protected final AbstractParserState nextState;
  public WhitespaceOrLetterState(AbstractParser parser,char thisLetter,
    AbstractParserState nextState) {
    super(parser);
    this.thisLetter = thisLetter;
    this.nextState = nextState;
  }
  public AbstractParserState consume(char ch) {
    if(ch == thisLetter) {
      return nextState;
    }
    if(ch == ' ' || ch == '\t') {
      return this;
    }
    if(ch == '\n') {
      getParser().getNewLineState();
    }
    return null;
  }
}

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/gcc

Modified Files:
	GccCCompiler.java GccLibrarian.java GccLinker.java 
	GccProcessor.java 
Log Message:
Fortran stuff

Index: GccCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GccCCompiler.java	6 Apr 2002 07:45:06 -0000	1.9
--- GccCCompiler.java	11 Apr 2002 05:34:42 -0000	1.10
***************
*** 211,215 ****
  
      protected void addImpliedArgs(Vector args, boolean debug,
!       boolean multithreaded, boolean staticLink, boolean exceptions) {
        args.addElement("-c");
        if(debug) {
--- 211,216 ----
  
      protected void addImpliedArgs(Vector args, boolean debug,
!       boolean multithreaded, boolean staticLink,
!       boolean staticRuntime, boolean exceptions) {
        args.addElement("-c");
        if(debug) {

Index: GccLibrarian.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GccLibrarian.java	10 Apr 2002 04:31:54 -0000	1.9
--- GccLibrarian.java	11 Apr 2002 05:34:42 -0000	1.10
***************
*** 115,119 ****
        return "ar";
      }
!     protected void addImpliedArgs(boolean debug,Vector args) {
      }
  
--- 115,119 ----
        return "ar";
      }
!     protected void addImpliedArgs(boolean debug,boolean staticRuntime, Vector args) {
      }
  
***************
*** 148,151 ****
--- 148,154 ----
  
      protected void addFixed(Boolean fixed, Vector args) {
+     }
+ 
+     protected void addIncremental(boolean incremental, Vector args) {
      }
  

Index: GccLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GccLinker.java	10 Apr 2002 04:31:54 -0000	1.14
--- GccLinker.java	11 Apr 2002 05:34:42 -0000	1.15
***************
*** 69,73 ****
  import net.sf.antcontrib.cpptasks.compiler.AbstractLinker;
  import net.sf.antcontrib.cpptasks.gcc.GccProcessor;
! 
  
  /**
--- 69,73 ----
  import net.sf.antcontrib.cpptasks.compiler.AbstractLinker;
  import net.sf.antcontrib.cpptasks.gcc.GccProcessor;
! import net.sf.antcontrib.cpptasks.types.LibrarySet;
  
  /**
***************
*** 194,201 ****
  
      protected String getCommand() {
!       return "gcc";
      }
  
!     protected void addImpliedArgs(boolean debug, Vector args) {
        if(debug) {
          args.addElement("-g");
--- 194,201 ----
  
      protected String getCommand() {
!       return "ld";
      }
  
!     protected void addImpliedArgs(boolean debug, boolean staticRuntime, Vector args) {
        if(debug) {
          args.addElement("-g");
***************
*** 241,250 ****
      }
  
      protected void addBase(long base, Vector args) {
      }
  
      protected void addMap(boolean map, Vector args) {
-       if(map) {
-       }
      }
  
--- 241,252 ----
      }
  
+     protected void addIncremental(boolean incremental, Vector args) {
+     }
+ 
+ 
      protected void addBase(long base, Vector args) {
      }
  
      protected void addMap(boolean map, Vector args) {
      }
  
***************
*** 266,269 ****
--- 268,351 ----
      public boolean isCaseSensitive() {
        return GccProcessor.isCaseSensitive();
+     }
+ 
+     protected void addLibrarySets(LibrarySet[] libsets, Vector args) {
+       super.addLibrarySets(libsets,args);
+       for (int i = 0; i < libsets.length; i++) {
+         LibrarySet set = libsets[i];
+         File libdir = set.getDir(null);
+         String[] libs = set.getLibs();
+         if(libdir != null) {
+           args.addElement("-L");
+           args.addElement(libdir.getAbsolutePath());
+         }
+         for (int j = 0; j < libs.length; j++) {
+           args.addElement("-l");
+           args.addElement(libs[i]);
+         }
+       }
+     }
+ 
+     /**
+      * Prepares argument list for exec command.  Will return null
+      * if command line would exceed allowable command line buffer.
+      *
+      * @param outputFile linker output file
+      * @param sourceFiles linker input files (.obj, .o, .res)
+      * @param args linker arguments
+      * @return arguments for runTask
+      */
+     protected String[] prepareArguments(
+         String outputDir,
+         String outputFile,
+         String[] sourceFiles,
+         CommandLineLinkerConfiguration config) {
+         //
+         //   need to suppress sources that correspond to
+         //        library set entries since they are already
+         //        in the argument list
+         String[] libnames = config.getLibraryNames();
+         if(libnames == null || libnames.length == 0) {
+           return super.prepareArguments(outputDir,outputFile,sourceFiles,config);
+         }
+         //
+         //
+         //   null out any sources that correspond to library names
+         //
+         String[] localSources = (String[]) sourceFiles.clone();
+         int extra = 0;
+         for (int i = 0; i < libnames.length; i++) {
+           String libname = libnames[i];
+           for (int j = 0; j < localSources.length; j++) {
+             if(localSources[j] != null &&
+               localSources[j].indexOf(libname) > 0 &&
+               localSources[j].indexOf("lib") > 0) {
+               String filename = new File(localSources[i]).getName();
+               if(filename.startsWith("lib") &&
+                   filename.substring(3).startsWith(libname)) {
+                   String extension = filename.substring(libname.length() + 3);
+                   if(extension.equals(".a") ||
+                     extension.equals(".so") ||
+                     extension.equals(".sl")) {
+                     localSources[j] = null;
+                     extra++;
+                  }
+               }
+             }
+           }
+         }
+ 
+         if(extra == 0) {
+           return super.prepareArguments(outputDir,outputFile,sourceFiles,config);
+         }
+ 
+         String[] finalSources = new String[localSources.length - extra];
+         int index = 0;
+         for (int i = 0; i < localSources.length; i++) {
+           if (localSources[i] != null) {
+             finalSources[index++] = localSources[i];
+           }
+         }
+         return super.prepareArguments(outputDir,outputFile,finalSources,config);
      }
  

Index: GccProcessor.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GccProcessor.java	10 Apr 2002 04:31:54 -0000	1.5
--- GccProcessor.java	11 Apr 2002 05:34:42 -0000	1.6
***************
*** 208,212 ****
  
  
- 
      /**
       *
--- 208,211 ----

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/types
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/types

Modified Files:
	CommandLineArgument.java LibrarySet.java 
Log Message:
Fortran stuff

Index: CommandLineArgument.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CommandLineArgument.java	8 Mar 2002 08:20:33 -0000	1.1
--- CommandLineArgument.java	11 Apr 2002 05:34:42 -0000	1.2
***************
*** 53,106 ****
   */
  package net.sf.antcontrib.cpptasks.types;
  
  /**
   * An compiler/linker command line flag.
   */
! public class CommandLineArgument implements java.io.Serializable
  {
      private String ifCond;
      private String unlessCond;
      private String value;
  
      public CommandLineArgument() {
      }
  
!     public boolean equals(Object other) {
!       if(other == this) {
!         return true;
!       }
!       if(other != null && other instanceof CommandLineArgument) {
!         CommandLineArgument otherCmd = (CommandLineArgument)  other;
!         return ((value == otherCmd.value) ||
!           (value != null && otherCmd.value != null && value.equals(otherCmd.value))) &&
!           ((ifCond == otherCmd.ifCond) ||
!            (ifCond != null && otherCmd.ifCond != null && ifCond.equals(otherCmd.ifCond))) &&
!           ((unlessCond == otherCmd.unlessCond) ||
!            (unlessCond != null && otherCmd.unlessCond != null && unlessCond.equals(otherCmd.unlessCond)));
!       }
!       return false;
      }
  
!     public int hashCode() {
!       int code = 17;
!       if(value != null) {
!         code = code * 37 + value.hashCode();
!       }
!       else {
!         code *= 37;
!       }
!       if(ifCond != null) {
!         code = code * 37 + ifCond.hashCode();
!       }
!       else {
!         code *= 37;
!       }
!       if(unlessCond != null) {
!         code = code * 37 + unlessCond.hashCode();
!       }
!       else {
!         code *= 37;
!       }
!       return code;
      }
  
--- 53,86 ----
   */
  package net.sf.antcontrib.cpptasks.types;
+ import org.apache.tools.ant.types.EnumeratedAttribute;
  
  /**
   * An compiler/linker command line flag.
   */
! public class CommandLineArgument
  {
      private String ifCond;
      private String unlessCond;
      private String value;
+     private int location;
  
      public CommandLineArgument() {
      }
  
!     /**
!      * Enumerated attribute with the values "dynamic" and "static",
!      */
!     public static class LocationEnum extends EnumeratedAttribute {
!         public String[] getValues() {
!             return new String[] {"start", "mid", "end" };
!         }
      }
  
!     public void setLocation(LocationEnum location) {
!       this.location = location.getIndex();
!     }
! 
!     public int getLocation() {
!       return location;
      }
  

Index: LibrarySet.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LibrarySet.java	10 Apr 2002 14:02:08 -0000	1.10
--- LibrarySet.java	11 Apr 2002 05:34:42 -0000	1.11
***************
*** 116,119 ****
--- 116,123 ----
      }
  
+     public File getDir(Project project) {
+       return set.getDir(project);
+     }
+ 
      /**
       * Sets case sensitivity of the file system.  If not set,
***************
*** 136,139 ****
--- 140,148 ----
      public void setLibs(CUtil.StringArrayBuilder libs) {
        libnames = libs.getValue();
+     }
+ 
+     public String[] getLibs() {
+       String[] retval = (String[]) libnames.clone();
+       return retval;
      }

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/devstudio

Modified Files:
	DevStudioCCompiler.java DevStudioLibrarian.java 
	DevStudioLinker.java DevStudioMIDLCompiler.java 
	DevStudioResourceCompiler.java 
Log Message:
Fortran stuff

Index: DevStudioCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DevStudioCCompiler.java	21 Mar 2002 06:34:03 -0000	1.6
--- DevStudioCCompiler.java	11 Apr 2002 05:34:41 -0000	1.7
***************
*** 127,134 ****
      }
  
      protected void addImpliedArgs(Vector args,
        boolean debug,
        boolean multithreaded,
!       boolean staticLink, boolean exceptions) {
        args.addElement("/c");
        args.addElement("/nologo");
--- 127,147 ----
      }
  
+     private static String[] mflags = new String[] {
+       //
+       //   first eight are single-threaded
+       //      static runtime exe, static runtime debug exe,
+       //      dynamic runtime exe, dynamic runtime debug exe
+       //      and same for dlls
+       "/ML", "/MLd", null, null, "/ML", "/MLd", null, null,
+       //
+       //  same sequence for multi-threaded
+       null, null, "/MT", "/MTd", null, null, "/MD", "/MDd" };
+ 
      protected void addImpliedArgs(Vector args,
        boolean debug,
        boolean multithreaded,
!       boolean staticLink,
!       boolean staticRuntime,
!       boolean exceptions) {
        args.addElement("/c");
        args.addElement("/nologo");
***************
*** 136,174 ****
          args.addElement("/GX");
        }
        if(debug) {
          args.addElement("/Zi");
          args.addElement("/Od");
          args.addElement("/GZ");
          args.addElement("/D_DEBUG");
!         if(multithreaded) {
!           args.addElement("/D_MT");
!           if(staticLink) {
!             args.addElement("/MTd");
!           }
!           else {
!             args.addElement("/MDd");
!             args.addElement("/D_DLL");
!           }
!         }
!         else {
!           args.addElement("/MLd");
!         }
!       }
!       else {
          args.addElement("/DNDEBUG");
-         if(multithreaded) {
-           args.addElement("/D_MT");
-           if(staticLink) {
-             args.addElement("/MT");
-           }
-           else {
-             args.addElement("/MD");
-             args.addElement("/D_DLL");
-           }
-         }
-         else {
-           args.addElement("/ML");
-         }
        }
  
      }
--- 149,177 ----
          args.addElement("/GX");
        }
+       int mindex = 0;
+       if(multithreaded) {
+         mindex += 8;
+       }
+       if(!staticLink) {
+         mindex += 4;
+       }
+       if(!staticRuntime) {
+         mindex += 2;
+       }
        if(debug) {
+         mindex += 1;
          args.addElement("/Zi");
          args.addElement("/Od");
          args.addElement("/GZ");
          args.addElement("/D_DEBUG");
!       } else {
          args.addElement("/DNDEBUG");
        }
+       String mflag = mflags[mindex];
+       if(mflag == null) {
+         throw new BuildException(
+           "Unsupported combination of multithread, runtime and link");
+       }
+       args.addElement(mflag);
  
      }

Index: DevStudioLibrarian.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DevStudioLibrarian.java	10 Apr 2002 04:31:54 -0000	1.8
--- DevStudioLibrarian.java	11 Apr 2002 05:34:41 -0000	1.9
***************
*** 91,95 ****
      }
  
!     private DevStudioLibrarian()
      {
          super(LinkType.STATIC_LIBRARY, new String[] { ".obj" }, new String[0]);
--- 91,95 ----
      }
  
!     protected DevStudioLibrarian()
      {
          super(LinkType.STATIC_LIBRARY, new String[] { ".obj" }, new String[0]);
***************
*** 97,105 ****
  
      public File[] getLibraryPath() {
!         return CUtil.getPathFromEnvironment("LIB",";");
      }
  
      public String[] getOutputFileSwitch(String outFile) {
!       return DevStudioProcessor.getOutputFileSwitch(outFile);
      }
  
--- 97,113 ----
  
      public File[] getLibraryPath() {
!       return new File[0];
      }
  
      public String[] getOutputFileSwitch(String outFile) {
!       StringBuffer buf = new StringBuffer("/OUT:");
!       if(outFile.indexOf(' ') >= 0) {
!         buf.append('"');
!         buf.append(outFile);
!         buf.append('"');
!       } else {
!         buf.append(outFile);
!       }
!       return new String[] { buf.toString() };
      }
  
***************
*** 129,143 ****
  
      protected String getCommand() {
!       return "link";
      }
      protected String getCommandFileSwitch(String cmdFile) {
        return DevStudioProcessor.getCommandFileSwitch(cmdFile);
      }
!     protected void addImpliedArgs(boolean debug,Vector args) {
      }
  
      public String getIdentifier() {
        if(identifier == null) {
!         identifier = getIdentifier(new String[] { "link" },"Microsoft Linker failure");
        }
        return identifier;
--- 137,153 ----
  
      protected String getCommand() {
!       return "lib";
      }
      protected String getCommandFileSwitch(String cmdFile) {
        return DevStudioProcessor.getCommandFileSwitch(cmdFile);
      }
!     protected void addImpliedArgs(boolean debug, boolean staticRuntime, Vector args) {
!       args.addElement("/nologo");
      }
  
      public String getIdentifier() {
        if(identifier == null) {
!         identifier = getIdentifier(new String[] { "lib", "/bogus" },
!           "Microsoft Lib failure");
        }
        return identifier;
***************
*** 155,158 ****
--- 165,171 ----
  
      protected void addMap(boolean map, Vector args) {
+     }
+ 
+     protected void addIncremental(boolean incremental, Vector args) {
      }
  

Index: DevStudioLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DevStudioLinker.java	10 Apr 2002 04:31:54 -0000	1.14
--- DevStudioLinker.java	11 Apr 2002 05:34:41 -0000	1.15
***************
*** 99,103 ****
      {
          super(linkType, new String[] { ".obj", ".lib",".res" },
!           new String[] { ".map", ".pdb", ".lnk" });
      }
  
--- 99,103 ----
      {
          super(linkType, new String[] { ".obj", ".lib",".res" },
!           new String[] { ".map", ".pdb", ".lnk", ".dll" });
      }
  
***************
*** 149,152 ****
--- 149,160 ----
      }
  
+     protected void addIncremental(boolean incremental, Vector args) {
+       if(incremental) {
+           args.addElement("/INCREMENTAL");
+         }
+         else {
+           args.addElement("/INCREMENTAL:NO");
+         }
+     }
  
      protected void addMap(boolean map, Vector args) {
***************
*** 185,189 ****
        return "link";
      }
!     protected void addImpliedArgs(boolean debug, Vector args) {
        args.addElement("/NOLOGO");
        //args.addElement("/NODEFAULTLIB");
--- 193,198 ----
        return "link";
      }
!     protected void addImpliedArgs(boolean debug,
!       boolean staticRuntime, Vector args) {
        args.addElement("/NOLOGO");
        //args.addElement("/NODEFAULTLIB");

Index: DevStudioMIDLCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DevStudioMIDLCompiler.java	21 Mar 2002 06:34:03 -0000	1.2
--- DevStudioMIDLCompiler.java	11 Apr 2002 05:34:41 -0000	1.3
***************
*** 58,61 ****
--- 58,64 ----
  import net.sf.antcontrib.cpptasks.*;
  import org.apache.tools.ant.BuildException;
+ import net.sf.antcontrib.cpptasks.parser.Parser;
+ import net.sf.antcontrib.cpptasks.parser.CParser;
+ 
  
  import java.io.File;
***************
*** 153,157 ****
        boolean debug,
        boolean multithreaded,
!       boolean staticLink, boolean exceptions) {
      }
  
--- 156,161 ----
        boolean debug,
        boolean multithreaded,
!       boolean staticLink,
!       boolean staticRuntime, boolean exceptions) {
      }
  

Index: DevStudioResourceCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DevStudioResourceCompiler.java	21 Mar 2002 06:34:03 -0000	1.2
--- DevStudioResourceCompiler.java	11 Apr 2002 05:34:41 -0000	1.3
***************
*** 55,58 ****
--- 55,60 ----
  
  import net.sf.antcontrib.cpptasks.compiler.*;
+ import net.sf.antcontrib.cpptasks.parser.Parser;
+ import net.sf.antcontrib.cpptasks.parser.CParser;
  import net.sf.antcontrib.cpptasks.types.*;
  import net.sf.antcontrib.cpptasks.*;
***************
*** 150,154 ****
        boolean debug,
        boolean multithreaded,
!       boolean staticLink, boolean exceptions) {
        if(debug) {
          args.addElement("/D_DEBUG");
--- 152,157 ----
        boolean debug,
        boolean multithreaded,
!       boolean staticLink,
!       boolean staticRuntime,boolean exceptions) {
        if(debug) {
          args.addElement("/D_DEBUG");

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/compiler

Modified Files:
	AbstractCompiler.java AbstractLinker.java 
	AbstractProcessor.java CommandLineCCompiler.java 
	CommandLineCompiler.java CommandLineCompilerConfiguration.java 
	CommandLineLinker.java CommandLineLinkerConfiguration.java 
	Processor.java 
Added Files:
	CommandLineFortranCompiler.java 
Log Message:
Fortran stuff

--- NEW FILE: CommandLineFortranCompiler.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.compiler;

import net.sf.antcontrib.cpptasks.parser.FortranParser;
import net.sf.antcontrib.cpptasks.parser.Parser;
import net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler;

/**
 * An abstract Compiler implementation which uses an external program to
 * perform the compile.
 *
 * @author Curt Arnold
 */
public abstract class CommandLineFortranCompiler extends CommandLineCompiler
{
    protected CommandLineFortranCompiler(String[] sourceExtensions, String[] headerExtensions) {
      super(sourceExtensions, headerExtensions);
    }

    protected Parser createParser() {
      return new FortranParser();
    }

}

Index: AbstractCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractCompiler.java	3 Apr 2002 08:42:58 -0000	1.7
--- AbstractCompiler.java	11 Apr 2002 05:34:41 -0000	1.8
***************
*** 55,58 ****
--- 55,59 ----
  
  import net.sf.antcontrib.cpptasks.*;
+ import net.sf.antcontrib.cpptasks.parser.Parser;
  import net.sf.antcontrib.cpptasks.os.*;
  import org.apache.tools.ant.Task;
***************
*** 60,63 ****
--- 61,65 ----
  import net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler;
  import net.sf.antcontrib.cpptasks.gcc.GccCCompiler;
+ import net.sf.antcontrib.cpptasks.CCTask;
  
  import java.io.*;
***************
*** 77,88 ****
  
      abstract protected CompilerConfiguration createConfiguration(
          ProcessorDef[] baseConfigs,CompilerDef specificConfig);
  
      public ProcessorConfiguration createConfiguration(
          ProcessorDef[] baseConfigs, ProcessorDef specificConfig) {
          if(specificConfig == null) {
            throw new NullPointerException("specificConfig");
          }
!         return createConfiguration(baseConfigs,(CompilerDef) specificConfig);
      }
  
--- 79,92 ----
  
      abstract protected CompilerConfiguration createConfiguration(
+         CCTask task,
          ProcessorDef[] baseConfigs,CompilerDef specificConfig);
  
      public ProcessorConfiguration createConfiguration(
+         CCTask task,
          ProcessorDef[] baseConfigs, ProcessorDef specificConfig) {
          if(specificConfig == null) {
            throw new NullPointerException("specificConfig");
          }
!         return createConfiguration(task,baseConfigs,(CompilerDef) specificConfig);
      }
  

Index: AbstractLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractLinker.java	10 Apr 2002 04:31:53 -0000	1.12
--- AbstractLinker.java	11 Apr 2002 05:34:41 -0000	1.13
***************
*** 64,67 ****
--- 64,68 ----
  import net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker;
  import net.sf.antcontrib.cpptasks.gcc.GccLinker;
+ import net.sf.antcontrib.cpptasks.CCTask;
  
  
***************
*** 82,94 ****
  
      abstract protected LinkerConfiguration createConfiguration(
        ProcessorDef[] baseConfigs,
        LinkerDef specificConfig);
  
      public ProcessorConfiguration createConfiguration(
          ProcessorDef[] baseConfigs, ProcessorDef specificConfig) {
          if(specificConfig == null) {
            throw new NullPointerException("specificConfig");
          }
!         return createConfiguration(baseConfigs,
                  (LinkerDef) specificConfig);
      }
--- 83,97 ----
  
      abstract protected LinkerConfiguration createConfiguration(
+       CCTask task,
        ProcessorDef[] baseConfigs,
        LinkerDef specificConfig);
  
      public ProcessorConfiguration createConfiguration(
+         CCTask task,
          ProcessorDef[] baseConfigs, ProcessorDef specificConfig) {
          if(specificConfig == null) {
            throw new NullPointerException("specificConfig");
          }
!         return createConfiguration(task,baseConfigs,
                  (LinkerDef) specificConfig);
      }

Index: AbstractProcessor.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractProcessor.java	17 Mar 2002 05:10:27 -0000	1.4
--- AbstractProcessor.java	11 Apr 2002 05:34:41 -0000	1.5
***************
*** 58,62 ****
  import net.sf.antcontrib.cpptasks.os.UnixInfo;
  import net.sf.antcontrib.cpptasks.os.WindowsInfo;
! import net.sf.antcontrib.cpptasks.CParser;
  import org.apache.tools.ant.Task;
  import java.util.Vector;
--- 58,62 ----
  import net.sf.antcontrib.cpptasks.os.UnixInfo;
  import net.sf.antcontrib.cpptasks.os.WindowsInfo;
! import net.sf.antcontrib.cpptasks.parser.CParser;
  import org.apache.tools.ant.Task;
  import java.util.Vector;

Index: CommandLineCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandLineCCompiler.java	17 Mar 2002 01:56:40 -0000	1.6
--- CommandLineCCompiler.java	11 Apr 2002 05:34:41 -0000	1.7
***************
*** 59,62 ****
--- 59,64 ----
  import org.apache.tools.ant.Project;
  import net.sf.antcontrib.cpptasks.*;
+ import net.sf.antcontrib.cpptasks.parser.CParser;
+ import net.sf.antcontrib.cpptasks.parser.Parser;
  import org.apache.tools.ant.types.*;
  import org.apache.tools.ant.taskdefs.LogStreamHandler;

Index: CommandLineCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandLineCompiler.java	6 Apr 2002 07:45:06 -0000	1.6
--- CommandLineCompiler.java	11 Apr 2002 05:34:41 -0000	1.7
***************
*** 60,63 ****
--- 60,64 ----
  import net.sf.antcontrib.cpptasks.types.DefineArgument;
  import net.sf.antcontrib.cpptasks.CUtil;
+ import net.sf.antcontrib.cpptasks.CCTask;
  import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
  import net.sf.antcontrib.cpptasks.CompilerDef;
***************
*** 87,91 ****
      abstract protected String getIncludeDirSwitch(String source);
      abstract protected void addImpliedArgs(Vector args,boolean debug,
!       boolean multithreaded, boolean staticLink, boolean exceptions);
      abstract protected void addWarningSwitch(Vector args, int warnings);
      abstract protected void getDefineSwitch(StringBuffer buffer,String define, String value);
--- 88,93 ----
      abstract protected String getIncludeDirSwitch(String source);
      abstract protected void addImpliedArgs(Vector args,boolean debug,
!       boolean multithreaded, boolean staticLink, boolean staticRuntime,
!       boolean exceptions);
      abstract protected void addWarningSwitch(Vector args, int warnings);
      abstract protected void getDefineSwitch(StringBuffer buffer,String define, String value);
***************
*** 126,129 ****
--- 128,132 ----
                          String[] sourceFiles,
                          String[] args,
+                         String[] endArgs,
                          boolean relentless) throws BuildException
      {
***************
*** 133,140 ****
          //
          String command = getCommand();
!         int baseLength = command.length() + args.length;
          for(int i = 0; i < args.length; i++) {
            baseLength += args[i].length();
          }
          if(baseLength > MAX_COMMANDLINE_LENGTH) {
            throw new BuildException("Command line is over maximum length without specifying source file");
--- 136,146 ----
          //
          String command = getCommand();
!         int baseLength = command.length() + args.length + endArgs.length;
          for(int i = 0; i < args.length; i++) {
            baseLength += args[i].length();
          }
+         for (int i = 0; i < endArgs.length; i++) {
+           baseLength += endArgs[i].length();
+         }
          if(baseLength > MAX_COMMANDLINE_LENGTH) {
            throw new BuildException("Command line is over maximum length without specifying source file");
***************
*** 162,166 ****
             }
  
!            String[] commandline = new String[args.length + 1 +
             	(firstFileNextExec - sourceIndex) * argumentCountPerInputFile];
             commandline[0] = command;
--- 168,172 ----
             }
  
!            String[] commandline = new String[args.length + 1 + endArgs.length +
             	(firstFileNextExec - sourceIndex) * argumentCountPerInputFile];
             commandline[0] = command;
***************
*** 174,177 ****
--- 180,188 ----
                  }
             }
+ 
+            for (int j = 0; j < endArgs.length; j++) {
+               commandline[commandIndex++] = endArgs[j];
+            }
+ 
             long compileStart = System.currentTimeMillis();
             int retval = runCommand(task, outputDir,commandline);
***************
*** 216,219 ****
--- 227,231 ----
  
      protected CompilerConfiguration createConfiguration(
+       CCTask task,
        ProcessorDef[] baseDefs,
        CompilerDef specificDef) {
***************
*** 227,238 ****
        defaultProviders[0] = specificDef;
  
! 
!       boolean multithreaded = specificDef.getMultithreaded(defaultProviders,1);
!       boolean debug = specificDef.getDebug(baseDefs,0);
!       boolean staticLink = specificDef.getStatic(defaultProviders,1);
!       boolean exceptions = specificDef.getExceptions(defaultProviders,1);
! 
!       this.addImpliedArgs(args,debug,multithreaded, staticLink, exceptions);
! 
        //
        //   add command line arguments inherited from <cc> element
--- 239,243 ----
        defaultProviders[0] = specificDef;
  
!       Vector cmdArgs = new Vector();
        //
        //   add command line arguments inherited from <cc> element
***************
*** 242,249 ****
          commandArgs = defaultProviders[i].getActiveProcessorArgs();
          for(int j = 0; j < commandArgs.length; j++) {
!           args.addElement(commandArgs[j].getValue());
          }
        }
  
  
        //
--- 247,267 ----
          commandArgs = defaultProviders[i].getActiveProcessorArgs();
          for(int j = 0; j < commandArgs.length; j++) {
!           if(commandArgs[j].getLocation() == 0) {
!             args.addElement(commandArgs[j].getValue());
!           } else {
!             cmdArgs.addElement(commandArgs[j]);
!           }
          }
        }
  
+       boolean multithreaded = specificDef.getMultithreaded(defaultProviders,1);
+       boolean debug = specificDef.getDebug(baseDefs,0);
+       boolean staticLink = (task.getLinkType() != LinkType.DYNAMIC_LIBRARY);
+       boolean exceptions = specificDef.getExceptions(defaultProviders,1);
+       boolean staticRuntime = task.getStaticRuntime();
+ 
+       this.addImpliedArgs(args,debug,multithreaded, staticLink, staticRuntime, exceptions);
+ 
+ 
  
        //
***************
*** 313,316 ****
--- 331,359 ----
        addWarningSwitch(args,warnings);
  
+       Enumeration argEnum = cmdArgs.elements();
+       int endCount = 0;
+       while(argEnum.hasMoreElements()) {
+         CommandLineArgument arg = (CommandLineArgument) argEnum.nextElement();
+         switch(arg.getLocation()) {
+           case 1:
+           args.addElement(arg.getValue());
+           break;
+ 
+           case 2:
+           endCount++;
+           break;
+         }
+       }
+ 
+       String[] endArgs = new String[endCount];
+ 
+       argEnum = cmdArgs.elements();
+       int index = 0;
+       while(argEnum.hasMoreElements()) {
+         CommandLineArgument arg = (CommandLineArgument) argEnum.nextElement();
+         if (arg.getLocation() == 2) {
+           endArgs[index++] = arg.getValue();
+         }
+       }
  
        String[] argArray = new String[args.size()];
***************
*** 327,331 ****
          incPath,sysIncPath,envIncludePath,
          includePathIdentifier.toString(),argArray,rebuild,
!         runtimeLibs);
      }
  
--- 370,374 ----
          incPath,sysIncPath,envIncludePath,
          includePathIdentifier.toString(),argArray,rebuild,
!         runtimeLibs,endArgs);
      }
  

Index: CommandLineCompilerConfiguration.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CommandLineCompilerConfiguration.java	17 Mar 2002 01:56:40 -0000	1.3
--- CommandLineCompilerConfiguration.java	11 Apr 2002 05:34:41 -0000	1.4
***************
*** 73,76 ****
--- 73,77 ----
      private /* final */ File[] includePath;
      private /* final */ File[] sysIncludePath;
+     private String[] endArgs;
      //
      //    include path from environment variable not
***************
*** 87,91 ****
        String includePathIdentifier,
        String[] args, boolean rebuild,
!       String[][] runtimeLibraries) {
        if(compiler == null) {
          throw new NullPointerException("compiler");
--- 88,93 ----
        String includePathIdentifier,
        String[] args, boolean rebuild,
!       String[][] runtimeLibraries,
!       String[] endArgs) {
        if(compiler == null) {
          throw new NullPointerException("compiler");
***************
*** 132,135 ****
--- 134,138 ----
        this.identifier = identifier;
        this.includePathIdentifier = includePathIdentifier;
+       this.endArgs = (String[]) endArgs.clone();
      }
  
***************
*** 160,164 ****
        boolean relentless)
        throws BuildException{
!         compiler.compile(task,outputDir, sourceFiles,args, relentless);
      }
  
--- 163,167 ----
        boolean relentless)
        throws BuildException{
!         compiler.compile(task,outputDir, sourceFiles,args, endArgs, relentless);
      }
  

Index: CommandLineLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CommandLineLinker.java	10 Apr 2002 04:31:53 -0000	1.15
--- CommandLineLinker.java	11 Apr 2002 05:34:41 -0000	1.16
***************
*** 71,74 ****
--- 71,75 ----
  import java.util.*;
  import java.io.IOException;
+ import net.sf.antcontrib.cpptasks.CCTask;
  
  /**
***************
*** 80,83 ****
--- 81,86 ----
  public abstract class CommandLineLinker extends AbstractLinker
  {
+     private String[] librarySets;
+ 
      /** Creates a comand line linker invocation */
      public CommandLineLinker(LinkType linkType,String[] extensions, String[] ignoredExtensions)
***************
*** 87,94 ****
  
      abstract protected String getCommand();
!     abstract protected void addImpliedArgs(boolean debug, Vector args);
  
      protected abstract void addFixed(Boolean fixed, Vector args);
      protected abstract void addMap(boolean map, Vector args);
      protected abstract void addBase(long base, Vector args);
      protected abstract void addStack(int stack, Vector args);
--- 90,99 ----
  
      abstract protected String getCommand();
!     abstract protected void addImpliedArgs(boolean debug,
!       boolean staticRuntime, Vector args);
  
      protected abstract void addFixed(Boolean fixed, Vector args);
      protected abstract void addMap(boolean map, Vector args);
+     protected abstract void addIncremental(boolean incremental, Vector args);
      protected abstract void addBase(long base, Vector args);
      protected abstract void addStack(int stack, Vector args);
***************
*** 96,106 ****
      protected abstract int getMaximumCommandLength();
      protected abstract String getCommandFileSwitch(String commandFile);
  
      protected LinkerConfiguration createConfiguration(
        ProcessorDef[] baseDefs, LinkerDef specificDef) {
  
        Vector args = new Vector();
  
!       boolean debug = specificDef.getDebug(baseDefs,0);
  
        LinkerDef[] defaultProviders = new LinkerDef[baseDefs.length+1];
--- 101,117 ----
      protected abstract int getMaximumCommandLength();
      protected abstract String getCommandFileSwitch(String commandFile);
+       //
+       //  Windows processors handle these through file list
+       //
+     protected void addLibrarySets(LibrarySet[] libsets, Vector args) {
+     }
  
      protected LinkerConfiguration createConfiguration(
+       CCTask task,
        ProcessorDef[] baseDefs, LinkerDef specificDef) {
  
        Vector args = new Vector();
  
!       Vector cmdArgs = new Vector();
  
        LinkerDef[] defaultProviders = new LinkerDef[baseDefs.length+1];
***************
*** 109,130 ****
          defaultProviders[i+1] = (LinkerDef) baseDefs[i];
        }
- 
-       addImpliedArgs(debug,args);
-       addFixed(specificDef.getFixed(defaultProviders,1),args);
-       addMap(specificDef.getMap(defaultProviders,1),args);
-       addBase(specificDef.getBase(defaultProviders,1),args);
-       addStack(specificDef.getStack(defaultProviders,1),args);
- 
        //
        //   add command line arguments inherited from <cc> element
!       //
        CommandLineArgument[] commandArgs;
!       for(int i = defaultProviders.length - 1; i >= 0; i--) {
          commandArgs = defaultProviders[i].getActiveProcessorArgs();
          for(int j = 0; j < commandArgs.length; j++) {
!           args.addElement(commandArgs[j].getValue());
          }
        }
  
  
        //
--- 120,167 ----
          defaultProviders[i+1] = (LinkerDef) baseDefs[i];
        }
        //
        //   add command line arguments inherited from <cc> element
!       //     any "extends" and finally the specific CompilerDef
        CommandLineArgument[] commandArgs;
!       for(int i = defaultProviders.length-1; i >= 0; i--) {
          commandArgs = defaultProviders[i].getActiveProcessorArgs();
          for(int j = 0; j < commandArgs.length; j++) {
!           if(commandArgs[j].getLocation() == 0) {
!             args.addElement(commandArgs[j].getValue());
!           } else {
!             cmdArgs.addElement(commandArgs[j]);
!           }
          }
        }
  
+       boolean debug = specificDef.getDebug(baseDefs,0);
+ 
+       boolean staticRuntime = task.getStaticRuntime();
+ 
+       addImpliedArgs(debug,staticRuntime,args);
+       addIncremental(specificDef.getIncremental(defaultProviders,1), args);
+       addFixed(specificDef.getFixed(defaultProviders,1),args);
+       addMap(specificDef.getMap(defaultProviders,1),args);
+       addBase(specificDef.getBase(defaultProviders,1),args);
+       addStack(specificDef.getStack(defaultProviders,1),args);
+ 
+       String[] libnames = null;
+       LibrarySet[] libsets = specificDef.getActiveLibrarySets(defaultProviders,1);
+       if (libsets.length > 0) {
+         addLibrarySets(libsets,args);
+         String[][] setNames = new String[libsets.length][];
+         int count = 0;
+         for(int i = 0; i < libsets.length; i++) {
+           setNames[i] = libsets[i].getLibs();
+           count += setNames[i].length;
+         }
+         libnames = new String[count];
+         int index = 0;
+         for (int i = 0; i < libsets.length; i++) {
+           for (int j = 0; j < setNames[i].length; j++) {
+             libnames[index++] = setNames[i][j];
+           }
+         }
+       }
  
        //
***************
*** 144,147 ****
--- 181,210 ----
        String configId = buf.toString();
  
+             Enumeration argEnum = cmdArgs.elements();
+       int endCount = 0;
+       while(argEnum.hasMoreElements()) {
+         CommandLineArgument arg = (CommandLineArgument) argEnum.nextElement();
+         switch(arg.getLocation()) {
+           case 1:
+           args.addElement(arg.getValue());
+           break;
+ 
+           case 2:
+           endCount++;
+           break;
+         }
+       }
+ 
+       String[] endArgs = new String[endCount];
+ 
+       argEnum = cmdArgs.elements();
+       int index = 0;
+       while(argEnum.hasMoreElements()) {
+         CommandLineArgument arg = (CommandLineArgument) argEnum.nextElement();
+         if (arg.getLocation() == 2) {
+           endArgs[index++] = arg.getValue();
+         }
+       }
+ 
        String[] argArray = new String[args.size()];
        args.copyInto(argArray);
***************
*** 151,155 ****
  
        return new CommandLineLinkerConfiguration(this,configId,argArray,
!           rebuild,map);
      }
  
--- 214,218 ----
  
        return new CommandLineLinkerConfiguration(this,configId,argArray,
!           rebuild,map,libnames);
      }
  
***************
*** 179,183 ****
          String outputDir,
          String outputFile,
!         String[] sourceFiles, CommandLineLinkerConfiguration config) {
          String[] args = config.getArguments();
          String outputSwitch[] =  getOutputFileSwitch(outputFile);
--- 242,247 ----
          String outputDir,
          String outputFile,
!         String[] sourceFiles,
!         CommandLineLinkerConfiguration config) {
          String[] args = config.getArguments();
          String outputSwitch[] =  getOutputFileSwitch(outputFile);
***************
*** 251,255 ****
            parentPath = parentDir.getAbsolutePath();
          }
!         String[] execArgs = prepareArguments(parentPath,outputFile.getName(), sourceFiles, config);
          int commandLength = 0;
          for(int i = 0; i < execArgs.length; i++) {
--- 315,320 ----
            parentPath = parentDir.getAbsolutePath();
          }
!         String[] execArgs = prepareArguments(parentPath,outputFile.getName(),
!             sourceFiles, config);
          int commandLength = 0;
          for(int i = 0; i < execArgs.length; i++) {

Index: CommandLineLinkerConfiguration.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandLineLinkerConfiguration.java	10 Apr 2002 04:31:53 -0000	1.6
--- CommandLineLinkerConfiguration.java	11 Apr 2002 05:34:41 -0000	1.7
***************
*** 73,80 ****
      private /* final */ boolean rebuild;
      private /* final */ boolean map;
  
      public CommandLineLinkerConfiguration(CommandLineLinker linker,
        String identifier, String[] args, boolean rebuild,
!         boolean map) {
        if(linker == null) {
          throw new NullPointerException("linker");
--- 73,81 ----
      private /* final */ boolean rebuild;
      private /* final */ boolean map;
+     private String[] libraryNames;
  
      public CommandLineLinkerConfiguration(CommandLineLinker linker,
        String identifier, String[] args, boolean rebuild,
!         boolean map, String[] libraryNames) {
        if(linker == null) {
          throw new NullPointerException("linker");
***************
*** 90,93 ****
--- 91,99 ----
        this.identifier = identifier;
        this.map = map;
+       if (libraryNames == null) {
+         this.libraryNames = new String[0];
+       } else {
+         this.libraryNames = (String[]) libraryNames.clone();
+       }
      }
  
***************
*** 134,137 ****
--- 140,148 ----
      public String getOutputFileName(String inputFile) {
        return linker.getOutputFileName(inputFile);
+     }
+ 
+     public String[] getLibraryNames() {
+       String[] clone = (String[]) libraryNames.clone();
+       return clone;
      }
  }

Index: Processor.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/Processor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Processor.java	3 Apr 2002 08:42:58 -0000	1.3
--- Processor.java	11 Apr 2002 05:34:41 -0000	1.4
***************
*** 57,60 ****
--- 57,61 ----
  import org.apache.tools.ant.Task;
  import net.sf.antcontrib.cpptasks.ProcessorDef;
+ import net.sf.antcontrib.cpptasks.CCTask;
  
  import java.io.File;
***************
*** 115,118 ****
--- 116,120 ----
       */
      ProcessorConfiguration createConfiguration(
+         CCTask task,
          ProcessorDef[] defaultProviders,
          ProcessorDef specificConfig);

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/borland

Modified Files:
	BorlandCCompiler.java BorlandCfgParser.java 
	BorlandLibrarian.java BorlandLinker.java 
	BorlandResourceCompiler.java 
Added Files:
	CfgFilenameState.java ConsumeToSpaceOrNewLine.java 
	QuoteBranchState.java 
Log Message:
Fortran stuff

--- NEW FILE: CfgFilenameState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.borland;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
import net.sf.antcontrib.cpptasks.parser.FilenameState;


public class CfgFilenameState extends FilenameState {
  public CfgFilenameState(AbstractParser parser, char[] terminators) {
    super(parser,terminators);
  }
  public AbstractParserState consume(char ch) {
    AbstractParserState newState = super.consume(ch);
    //
    //   change null (consume to end of line)
    //      to look for next switch character
    if(newState == null) {
      newState = getParser().getNewLineState();
    }
    return newState;
  }
}


--- NEW FILE: ConsumeToSpaceOrNewLine.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.borland;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
import net.sf.antcontrib.cpptasks.parser.FilenameState;

public class ConsumeToSpaceOrNewLine extends AbstractParserState {
  private AbstractParserState unquote;
  public ConsumeToSpaceOrNewLine(AbstractParser parser) {
    super(parser);
    this.unquote = unquote;
  }
  public AbstractParserState consume(char ch) {
    if(ch == ' ' || ch == '\t' || ch == '\n') {
      return getParser().getNewLineState();
    }
    return this;
  }
}


--- NEW FILE: QuoteBranchState.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.borland;

import net.sf.antcontrib.cpptasks.parser.AbstractParser;
import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
import net.sf.antcontrib.cpptasks.parser.FilenameState;


public class QuoteBranchState extends AbstractParserState {
  private AbstractParserState unquote;
  private AbstractParserState quote;
  public QuoteBranchState(AbstractParser parser,
    AbstractParserState quote,AbstractParserState unquote) {
    super(parser);
    this.quote = quote;
    this.unquote = unquote;
  }
  public AbstractParserState consume(char ch) {
    if(ch == '"') {
      return quote;
    }
    return unquote.consume(ch);
  }
}

Index: BorlandCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BorlandCCompiler.java	2 Apr 2002 07:22:54 -0000	1.2
--- BorlandCCompiler.java	11 Apr 2002 05:34:41 -0000	1.3
***************
*** 124,128 ****
        boolean debug,
        boolean multithreaded,
!       boolean staticLink, boolean exceptions) {
        args.addElement("-c");
        //
--- 124,130 ----
        boolean debug,
        boolean multithreaded,
!       boolean staticLink,
!       boolean staticRuntime,
!       boolean exceptions) {
        args.addElement("-c");
        //

Index: BorlandCfgParser.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BorlandCfgParser.java	2 Apr 2002 07:22:54 -0000	1.1
--- BorlandCfgParser.java	11 Apr 2002 05:34:41 -0000	1.2
***************
*** 57,61 ****
  import java.util.*;
  import org.apache.tools.ant.Task;
! import net.sf.antcontrib.cpptasks.AbstractParser;
  
  /**
--- 57,67 ----
  import java.util.*;
  import org.apache.tools.ant.Task;
! import net.sf.antcontrib.cpptasks.parser.AbstractParser;
! import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
! import net.sf.antcontrib.cpptasks.borland.CfgFilenameState;
! import net.sf.antcontrib.cpptasks.borland.QuoteBranchState;
! import net.sf.antcontrib.cpptasks.borland.ConsumeToSpaceOrNewLine;
! import net.sf.antcontrib.cpptasks.parser.LetterState;
! import net.sf.antcontrib.cpptasks.parser.WhitespaceOrLetterState;
  
  /**
***************
*** 66,70 ****
  public final class BorlandCfgParser extends AbstractParser
  {
!     private State newLineState;
      private final Vector path = new Vector();
  
--- 72,76 ----
  public final class BorlandCfgParser extends AbstractParser
  {
!     private AbstractParserState newLineState;
      private final Vector path = new Vector();
  
***************
*** 79,90 ****
          //      if a new line is encountered first
          //
!         State quote = new CfgFilenameState(this,new char[] { '"' });
          //
          //    an unquoted path (-Ic:\borland\include)
          //      ends at the first space or new line
!         State unquote = new CfgFilenameState(this, new char[] {' ','\n', '\r'});
!         State quoteBranch = new QuoteBranchState(this, quote, unquote);
!         State toNextSwitch = new ConsumeToSpaceOrNewLine(this);
!         State switchState = new LetterState(this,switchChar, quoteBranch, toNextSwitch);
          newLineState = new WhitespaceOrLetterState(this,'-',switchState);
      }
--- 85,96 ----
          //      if a new line is encountered first
          //
!         AbstractParserState quote = new CfgFilenameState(this,new char[] { '"' });
          //
          //    an unquoted path (-Ic:\borland\include)
          //      ends at the first space or new line
!         AbstractParserState unquote = new CfgFilenameState(this, new char[] {' ','\n', '\r'});
!         AbstractParserState quoteBranch = new QuoteBranchState(this, quote, unquote);
!         AbstractParserState toNextSwitch = new ConsumeToSpaceOrNewLine(this);
!         AbstractParserState switchState = new LetterState(this,switchChar, quoteBranch, toNextSwitch);
          newLineState = new WhitespaceOrLetterState(this,'-',switchState);
      }
***************
*** 103,156 ****
      }
  
!     public State getNewLineState() {
        return newLineState;
      }
- 
-     private class CfgFilenameState extends FilenameState {
-       public CfgFilenameState(AbstractParser parser, char[] terminators) {
-         super(parser,terminators);
-       }
-       public State consume(char ch) {
-         State newState = super.consume(ch);
-         //
-         //   change null (consume to end of line)
-         //      to look for next switch character
-         if(newState == null) {
-           newState = parser.getNewLineState();
-         }
-         return newState;
-       }
-     }
- 
-     private class QuoteBranchState extends State {
-       private State unquote;
-       private State quote;
-       public QuoteBranchState(AbstractParser parser, State quote,State unquote) {
-         super(parser);
-         this.quote = quote;
-         this.unquote = unquote;
-       }
-       public State consume(char ch) {
-         if(ch == '"') {
-           return quote;
-         }
-         return unquote.consume(ch);
-       }
-     }
- 
-     private class ConsumeToSpaceOrNewLine extends State {
-       private State unquote;
-       public ConsumeToSpaceOrNewLine(AbstractParser parser) {
-         super(parser);
-         this.unquote = unquote;
-       }
-       public State consume(char ch) {
-         if(ch == ' ' || ch == '\t' || ch == '\n') {
-           return parser.getNewLineState();
-         }
-         return this;
-       }
-     }
- 
  }
  
--- 109,115 ----
      }
  
!     public AbstractParserState getNewLineState() {
        return newLineState;
      }
  }
  

Index: BorlandLibrarian.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BorlandLibrarian.java	10 Apr 2002 04:31:53 -0000	1.5
--- BorlandLibrarian.java	11 Apr 2002 05:34:41 -0000	1.6
***************
*** 134,138 ****
      }
  
!     protected void addImpliedArgs(boolean debug, Vector args) {
      }
  
--- 134,138 ----
      }
  
!     protected void addImpliedArgs(boolean debug, boolean staticRuntime, Vector args) {
      }
  
***************
*** 147,150 ****
--- 147,153 ----
  
      protected void addFixed(Boolean fixed, Vector args) {
+     }
+ 
+     protected void addIncremental(boolean incremental, Vector args) {
      }
  

Index: BorlandLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BorlandLinker.java	10 Apr 2002 04:31:53 -0000	1.5
--- BorlandLinker.java	11 Apr 2002 05:34:41 -0000	1.6
***************
*** 170,174 ****
        return "ilink32";
      }
!     protected void addImpliedArgs(boolean debug, Vector args) {
        LinkType linkType = getLinkType();
        if(linkType == LinkType.EXECUTABLE) {
--- 170,174 ----
        return "ilink32";
      }
!     protected void addImpliedArgs(boolean debug, boolean staticRuntime, Vector args) {
        LinkType linkType = getLinkType();
        if(linkType == LinkType.EXECUTABLE) {
***************
*** 375,378 ****
--- 375,382 ----
      public String[] getLibraryPatterns(String[] libnames) {
        return BorlandProcessor.getLibraryPatterns(libnames);
+     }
+ 
+ 
+     protected void addIncremental(boolean incremental, Vector args) {
      }
  

Index: BorlandResourceCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BorlandResourceCompiler.java	2 Apr 2002 07:22:54 -0000	1.2
--- BorlandResourceCompiler.java	11 Apr 2002 05:34:41 -0000	1.3
***************
*** 58,61 ****
--- 58,64 ----
  import net.sf.antcontrib.cpptasks.*;
  import org.apache.tools.ant.BuildException;
+ import net.sf.antcontrib.cpptasks.parser.Parser;
+ import net.sf.antcontrib.cpptasks.parser.CParser;
+ 
  
  import java.io.File;
***************
*** 159,165 ****
                          String[] sourceFiles,
                          String[] args,
                          boolean relentless) throws BuildException
      {
!       super.compile(task,outputDir,sourceFiles,args,relentless);
      }
  
--- 162,169 ----
                          String[] sourceFiles,
                          String[] args,
+                         String[] endArgs,
                          boolean relentless) throws BuildException
      {
!       super.compile(task,outputDir,sourceFiles,args,endArgs,relentless);
      }
  
***************
*** 179,183 ****
        boolean debug,
        boolean multithreaded,
!       boolean staticLink, boolean exceptions) {
        //
        //  compile only
--- 183,189 ----
        boolean debug,
        boolean multithreaded,
!       boolean staticLink,
!       boolean staticRuntime,
!       boolean exceptions) {
        //
        //  compile only

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compaq
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks/compaq

Added Files:
	CompaqVisualFortranCompiler.java 
	CompaqVisualFortranLibrarian.java 
	CompaqVisualFortranLinker.java 
Log Message:
Fortran stuff

--- NEW FILE: CompaqVisualFortranCompiler.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.compaq;

import net.sf.antcontrib.cpptasks.compiler.CommandLineFortranCompiler;
import net.sf.antcontrib.cpptasks.compiler.LinkType;
import net.sf.antcontrib.cpptasks.types.DefineArgument;
import net.sf.antcontrib.cpptasks.CUtil;
import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
import org.apache.tools.ant.BuildException;
import net.sf.antcontrib.cpptasks.CompilerDef;
import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
import net.sf.antcontrib.cpptasks.compiler.Linker;
import net.sf.antcontrib.cpptasks.compiler.AbstractCompiler;
import net.sf.antcontrib.cpptasks.compaq.CompaqVisualFortranLinker;
import java.util.Hashtable;

import java.io.File;
import java.util.*;

/**
 * Compaq Visual Fortran compiler adapter.  Previously known as DIGITAL Visual
 * Fortran.
 *
 * @author Curt Arnold
 */
public class CompaqVisualFortranCompiler extends CommandLineFortranCompiler
{
    private static final CompaqVisualFortranCompiler[] instance =
        new CompaqVisualFortranCompiler[] { new CompaqVisualFortranCompiler() };

    private String identifier;

    private CompaqVisualFortranCompiler() {
      super(new String[] { ".f90", ".for", ".f" },
            new String[] { ".i", ".i90", ".fpp", ".inc", ".bak", ".exe" } );
    }


    public static CompaqVisualFortranCompiler getInstance() {
      return instance[0];
    }

    protected String getCommand() {
      return "DF";
    }

    protected File[] getEnvironmentIncludePath() {
        return CUtil.getPathFromEnvironment("INCLUDE",";");
    }

    protected String getIncludeDirSwitch(String includeDir) {
      StringBuffer buf = new StringBuffer("/include:");
      if(includeDir.indexOf(' ') >= 0) {
        buf.append('"');
        buf.append(includeDir);
        buf.append('"');
      }
      else {
        buf.append(includeDir);
      }
      return buf.toString();
    }

    public void addWarningSwitch(Vector args, int level) {
      switch(level) {
        case 0:
        args.addElement("/nowarn");
        break;

        case 1:
        break;

        case 2:
        break;

        case 3:
        args.addElement("/warn:usage");
        break;

        case 4:
        args.addElement("/warn:all");
        break;

        case 5:
        args.addElement("/warn:errors");
        break;
      }
    }

    protected void getDefineSwitch(StringBuffer buf,String define, String value) {
      buf.append("/define:");
      buf.append(define);
      if(value != null && value.length() > 0) {
        buf.append('=');
        buf.append(value);
      }
    }

    protected void getUndefineSwitch(StringBuffer buf, String define) {
      buf.append("/undefine:");
      buf.append(define);
    }

    public String getIdentifier() {
      if(identifier == null) {
        identifier = getIdentifier(new String[] { "DF" },"Compaq Visual Fortran");
      }
      return identifier;
    }

    public String toString() {
      return getIdentifier();
    }

    protected void addImpliedArgs(Vector args,
      boolean debug,
      boolean multithreaded,
      boolean staticLink,
      boolean staticRuntime,
      boolean exceptions) {
      args.addElement("/nologo");
      args.addElement("/compile_only");
      if(debug) {
        args.addElement("/debug:full");
        args.addElement("/define:_DEBUG");
      } else {
        args.addElement("/debug:none");
        args.addElement("/define:NDEBUG");
      }
      if(multithreaded) {
        args.addElement("/threads");
        args.addElement("/define:_MT");
      } else {
          args.addElement("/nothreads");
      }
      if(staticLink) {
        if(staticRuntime) {
          args.addElement("/libs:static");
        } else {
          args.addElement("/libs:dll");
        }
      } else {
        args.addElement("/dll");
        args.addElement("/define:_DLL");
        args.addElement("/libs:dll");
      }
    }


    public net.sf.antcontrib.cpptasks.compiler.Compiler[] getCompilers() {
      return instance;
    }

    public Linker getLinker(LinkType type) {
      return CompaqVisualFortranLinker.getInstance().getLinker(type);
    }

    public String[][] getRuntimeLibraries(boolean debug,
      boolean multitasking, boolean staticLink) {
      String[][] rtls = new String[2][0];
      return rtls;
    }

}

--- NEW FILE: CompaqVisualFortranLibrarian.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2002 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.compaq;

import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
import net.sf.antcontrib.cpptasks.compiler.LinkType;
import net.sf.antcontrib.cpptasks.CUtil;

import java.io.File;
import java.util.*;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Environment;

import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import java.util.Hashtable;
import net.sf.antcontrib.cpptasks.LinkerDef;
import net.sf.antcontrib.cpptasks.compiler.LinkerConfiguration;
import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
import net.sf.antcontrib.cpptasks.compiler.Linker;
import net.sf.antcontrib.cpptasks.devstudio.DevStudioLibrarian;
import net.sf.antcontrib.cpptasks.devstudio.DevStudioProcessor;


/**
 * The Compaq Visual Fortran Librarian
 *
 *
 * @author Curt Arnold
 */
public class CompaqVisualFortranLibrarian extends CommandLineLinker {
    private static final CompaqVisualFortranLibrarian instance =
        new CompaqVisualFortranLibrarian();

    private CompaqVisualFortranLibrarian() {
        super(LinkType.STATIC_LIBRARY, new String[] { ".obj" }, new String[0]);
    }

    public File[] getLibraryPath() {
      return new File[0];
    }

    public String getIdentifier() {
      return DevStudioLibrarian.getInstance().getIdentifier();
    }


    public static CompaqVisualFortranLibrarian getInstance() {
      return instance;
    }

    protected String getCommand() {
      return "lib";
    }

    protected void addImpliedArgs(boolean debug, boolean staticRuntime, Vector args) {
      args.addElement("/nologo");
    }

    protected void addFixed(Boolean fixed, Vector args) {
    }

    protected void addMap(boolean map, Vector args) {
    }

    protected void addBase(long base, Vector args) {
    }

    protected void addStack(int stack, Vector args) {
    }

    protected void addIncremental(boolean incremental, Vector args) {
    }

    protected String[] getOutputFileSwitch(String outputFile) {
      return DevStudioLibrarian.getInstance().getOutputFileSwitch(outputFile);
    }
    protected int getMaximumCommandLength() {
      return DevStudioLibrarian.getInstance().getMaximumCommandLength();
    }

    protected String getCommandFileSwitch(String commandFile) {
      return DevStudioProcessor.getCommandFileSwitch(commandFile);
    }


    public net.sf.antcontrib.cpptasks.compiler.Compiler[] getCompilers() {
      return CompaqVisualFortranCompiler.getInstance().getCompilers();
    }

    public Linker getLinker(LinkType type) {
      return CompaqVisualFortranLinker.getInstance().getLinker(type);
    }

    public String[] getLibraryPatterns(String[] libnames) {
      return new String[0];
    }

    public boolean isCaseSensitive() {
      return false;
    }

}

--- NEW FILE: CompaqVisualFortranLinker.java ---
/*
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *    any, must include the following acknowlegement:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement may appear in the software itself,
 *    if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Ant", and "Apache Software
 *    Foundation" must not be used to endorse or promote products derived
 *    from this software without prior written permission. For written
 *    permission, please contact apache@....
 *
 * 5. Products derived from this software may not be called "Apache"
 *    nor may "Apache" appear in their names without prior written
 *    permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
package net.sf.antcontrib.cpptasks.compaq;

import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
import net.sf.antcontrib.cpptasks.compiler.LinkType;
import net.sf.antcontrib.cpptasks.CUtil;

import java.io.File;
import java.util.*;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Environment;

import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import java.util.Hashtable;
import net.sf.antcontrib.cpptasks.LinkerDef;
import net.sf.antcontrib.cpptasks.compiler.LinkerConfiguration;
import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
import net.sf.antcontrib.cpptasks.compiler.Linker;
import net.sf.antcontrib.cpptasks.LinkerDef;
import net.sf.antcontrib.cpptasks.compiler.AbstractLinker;
import net.sf.antcontrib.cpptasks.devstudio.DevStudioProcessor;
import net.sf.antcontrib.cpptasks.devstudio.DevStudioLibrarian;

import java.util.Hashtable;



/**
 * The Compaq Visual Fortran linker.
 *
 * @author Curt Arnold
 */
public final class CompaqVisualFortranLinker extends CommandLineLinker
{
    private static final CompaqVisualFortranLinker instance =
        new CompaqVisualFortranLinker(LinkType.EXECUTABLE);
    private static final CompaqVisualFortranLinker dllLinker =
        new CompaqVisualFortranLinker(LinkType.DYNAMIC_LIBRARY);
    private static final CompaqVisualFortranLinker guiLinker =
        new CompaqVisualFortranLinker(LinkType.GUI);

    private String identifier;

    private CompaqVisualFortranLinker(LinkType linkType)
    {
        super(linkType, new String[] { ".obj", ".lib",".res" },
          new String[] { ".map", ".pdb", ".lnk", ".dll", ".exe" });
    }

    public static CompaqVisualFortranLinker getInstance() {
      return instance;
    }

    /**
     */
    static CompaqVisualFortranLinker getDllLinker() {
      return dllLinker;
    }

    static CompaqVisualFortranLinker getGuiLinker() {
      return guiLinker;
    }

    public File[] getLibraryPath() {
        return CUtil.getPathFromEnvironment("LIB",";");
    }

    /**
     * Returns true if this linker can use static libraries.
     */
    protected boolean usesStaticLibs()
    {
        return true;
    }

    /**
     * Returns true if this linker can use shared libraries.
     */
    protected boolean usesSharedLibs()
    {
        // Need to pass a .lib, rather than a .dll to 'link'
        return false;
    }


    protected void addFixed(Boolean fixed, Vector args) {
      if(fixed != null) {
        if(fixed.booleanValue()) {
          args.addElement("/FIXED");
        }
        else {
          args.addElement("/FIXED:NO");
        }
      }
    }


    protected void addMap(boolean map, Vector args) {
      if(map) {
          args.addElement("/MAP");
      }
      else {
          args.addElement("/MAP:NO");
      }
    }


    protected void addBase(long base, Vector args) {
      if(base >= 0) {
        String baseAddr = Long.toHexString(base);
        args.addElement("/BASE:0x" + baseAddr);
      }
    }

    protected void addStack(int stack, Vector args) {
      if(stack >= 0) {
        String stackStr = Integer.toHexString(stack);
        args.addElement("/STACK:0x" + stackStr);
      }
    }


    public Linker getLinker(LinkType type) {
      if (type == LinkType.DYNAMIC_LIBRARY) {
        return dllLinker;
      }
      if (type == LinkType.GUI) {
        return guiLinker;
      }
      if (type == LinkType.STATIC_LIBRARY) {
        return DevStudioLibrarian.getInstance();
      }
      return instance;
    }

    public net.sf.antcontrib.cpptasks.compiler.Compiler[] getCompilers() {
      return CompaqVisualFortranCompiler.getInstance().getCompilers();
    }

    protected String getCommand() {
      return "DF";
    }
    protected void addImpliedArgs(boolean debug, boolean staticRuntime,
      Vector args) {
      args.addElement("/NOLOGO");
      if (staticRuntime) {
        args.addElement("/libs:static");
      } else {
        args.addElement("/libs:dll");
      }

      if (debug) {
       args.addElement("/debug");
      } else {
      }
      LinkType linkType = getLinkType();
      if(linkType == LinkType.DYNAMIC_LIBRARY) {
        args.addElement("/dll");
      } else {
        if(linkType == LinkType.EXECUTABLE) {
          args.addElement("/exe");
        }
      }
    }

    public String getIdentifier() {
      if(identifier == null) {
        identifier = getIdentifier(new String[] { "DF", "__bogus__.xxx" },
          "Compaq Visual Fortran Linker ");
      }
      return identifier;
    }

    public String getCommandFileSwitch(String commandFile) {
      return "@" + commandFile;
    }

    public String[] getOutputFileSwitch(String outputFile) {
      StringBuffer buf = new StringBuffer("/OUT:");
      if(outputFile.indexOf(' ') >= 0) {
        buf.append('"');
        buf.append(outputFile);
        buf.append('"');
      } else {
        buf.append(outputFile);
      }
      return new String[] { buf.toString() };
    }

    public int getMaximumCommandLength() {
      return 1024;
    }

    public String[] getLibraryPatterns(String[] libnames) {
      return DevStudioProcessor.getLibraryPatterns(libnames);
    }

    public boolean isCaseSensitive() {
      return false;
    }

    protected void addIncremental(boolean incremental, Vector args) {
        args.addElement("/LINK");
        if(incremental) {
          args.addElement("/INCREMENTAL");
        }
        else {
          args.addElement("/INCREMENTAL:NO");
        }
    }


}

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks
In directory usw-pr-cvs1:/tmp/cvs-serv2371/net/sf/antcontrib/cpptasks

Modified Files:
	CCTask.java CompilerDef.java LinkerDef.java ProcessorDef.java 
Removed Files:
	AbstractParser.java CParser.java Parser.java 
Log Message:
Fortran stuff

Index: CCTask.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/CCTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CCTask.java	10 Apr 2002 04:31:53 -0000	1.18
--- CCTask.java	11 Apr 2002 05:34:41 -0000	1.19
***************
*** 57,61 ****
  import net.sf.antcontrib.cpptasks.types.DefineSet;
  import net.sf.antcontrib.cpptasks.types.LibrarySet;
- import net.sf.antcontrib.cpptasks.types.SystemLibrarySet;
  import net.sf.antcontrib.cpptasks.compiler.*;
  import org.apache.tools.ant.types.FileSet;
--- 57,60 ----
***************
*** 81,84 ****
--- 80,84 ----
      */
      private CompilerDef compilerDef;
+     private boolean staticRuntime;
      /**
      *   Content that appears in <cc> and also in <linker>
***************
*** 157,161 ****
      {
          linker.setProject(project);
-         linker.setLinkType(_linkType);
          _linkers.addElement(linker);
      }
--- 157,160 ----
***************
*** 183,193 ****
      }
  
-     /**
-      * Enables generation of static linked code
-      */
-     public void setStatic(boolean staticLink) {
-         compilerDef.setStatic(staticLink);
-     }
- 
      public void setRebuild(boolean rebuildAll) {
          compilerDef.setRebuild(rebuildAll);
--- 182,185 ----
***************
*** 200,208 ****
      public void setLink(LinkTypeEnum linkType) throws BuildException
      {
          _linkType = LinkType.getLinkType(linkType.getValue());
          if ( _linkType == null ) {
              throw new BuildException("Unknown linker output type \"" + linkType + "\".");
          }
-         linkerDef.setLinkType(_linkType);
      }
  
--- 192,202 ----
      public void setLink(LinkTypeEnum linkType) throws BuildException
      {
+         if(linkType == null) {
+           throw new NullPointerException("linkType");
+         }
          _linkType = LinkType.getLinkType(linkType.getValue());
          if ( _linkType == null ) {
              throw new BuildException("Unknown linker output type \"" + linkType + "\".");
          }
      }
  
***************
*** 246,250 ****
       * Adds a library set.
       */
!     public void addSyslibset(SystemLibrarySet libset)
      {
          linkerDef.addSyslibset(libset);
--- 240,244 ----
       * Adds a library set.
       */
!     public void addSyslibset(LibrarySet libset)
      {
          linkerDef.addSyslibset(libset);
***************
*** 300,305 ****
            CompilerDef currentCompilerDef = (CompilerDef) _compilers.elementAt(i);
            if(currentCompilerDef.isActive()) {
              ProcessorConfiguration config =
!                 currentCompilerDef.createConfiguration(compilerDef);
              //
              //   if the compiler has a fileset
--- 294,300 ----
            CompilerDef currentCompilerDef = (CompilerDef) _compilers.elementAt(i);
            if(currentCompilerDef.isActive()) {
+ 
              ProcessorConfiguration config =
!                 currentCompilerDef.createConfiguration(this,compilerDef);
              //
              //   if the compiler has a fileset
***************
*** 322,326 ****
          //    add fallback compiler at the end
          //
!         ProcessorConfiguration config = compilerDef.createConfiguration(null);
          biddingProcessors.addElement(config);
  
--- 317,321 ----
          //    add fallback compiler at the end
          //
!         ProcessorConfiguration config = compilerDef.createConfiguration(this,null);
          biddingProcessors.addElement(config);
  
***************
*** 555,559 ****
            if(currentLinkerDef.isActive()) {
              selectedLinkerDef = currentLinkerDef;
!             selectedLinker = (Linker) currentLinkerDef.getProcessor();
              //
              //   skip the linker if it doesn't know how to
--- 550,554 ----
            if(currentLinkerDef.isActive()) {
              selectedLinkerDef = currentLinkerDef;
!             selectedLinker = currentLinkerDef.getProcessor().getLinker(_linkType);
              //
              //   skip the linker if it doesn't know how to
***************
*** 561,565 ****
              if(selectedLinker != null) {
  
!               linkerConfig = currentLinkerDef.createConfiguration(linkerDef);
                if(linkerConfig != null) {
                  //
--- 556,560 ----
              if(selectedLinker != null) {
  
!               linkerConfig = currentLinkerDef.createConfiguration(this,linkerDef);
                if(linkerConfig != null) {
                  //
***************
*** 589,594 ****
  
          if(linkerConfig == null) {
!           linkerConfig = linkerDef.createConfiguration(null);
!           selectedLinker = (Linker) linkerDef.getProcessor();
            objCollector = new ObjectFileCollector(selectedLinker, objectFiles);
            sysLibraryCollector = new SystemLibraryCollector(selectedLinker,sysLibraries);
--- 584,589 ----
  
          if(linkerConfig == null) {
!           linkerConfig = linkerDef.createConfiguration(this,null);
!           selectedLinker = (Linker) linkerDef.getProcessor().getLinker(_linkType);
            objCollector = new ObjectFileCollector(selectedLinker, objectFiles);
            sysLibraryCollector = new SystemLibraryCollector(selectedLinker,sysLibraries);
***************
*** 759,763 ****
--- 754,781 ----
      }
  
+     /**
+      * Enumerated attribute with the values "dynamic" and "static",
+      */
+     public static class RuntimeType extends EnumeratedAttribute {
+         public String[] getValues() {
+             return new String[] {"dynamic", "static" };
+         }
+     }
+ 
+     public void setStaticRuntime(RuntimeType rtlType) {
+       staticRuntime = (rtlType.getIndex() == 1);
+     }
+ 
+     public boolean getStaticRuntime() {
+       return staticRuntime;
+     }
  
+     public LinkType getLinkType() {
+       return _linkType;
+     }
+ 
+     public void setIncremental(boolean incremental) {
+       linkerDef.setIncremental(incremental);
+     }
  
      /** The output file. */

Index: CompilerDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/CompilerDef.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CompilerDef.java	9 Apr 2002 06:50:05 -0000	1.12
--- CompilerDef.java	11 Apr 2002 05:34:41 -0000	1.13
***************
*** 64,67 ****
--- 64,68 ----
  import net.sf.antcontrib.cpptasks.devstudio.*;
  import net.sf.antcontrib.cpptasks.borland.*;
+ import net.sf.antcontrib.cpptasks.compaq.CompaqVisualFortranCompiler;
  import java.util.Vector;
  import java.util.Hashtable;
***************
*** 87,91 ****
      private Boolean multithreaded;
      private Boolean exceptions;
-     private Boolean staticLink;
      private int warnings = -1;
  
--- 88,91 ----
***************
*** 230,258 ****
  
  
-     public void setStatic(boolean staticLink) {
-       if ( isReference() ) {
-           throw tooManyAttributes();
-       }
-       this.staticLink = booleanValueOf(staticLink);
-     }
- 
-     public boolean getStatic(CompilerDef[] defaultProviders,int index) {
-       if(isReference()) {
-         return ((CompilerDef)getCheckedRef(CompilerDef.class, "CompilerDef")).
-                 getStatic(defaultProviders,index);
-       }
-       if(staticLink != null) {
-         return staticLink.booleanValue();
-       }
-       else {
-         if(defaultProviders != null && index < defaultProviders.length) {
-           return defaultProviders[index].getStatic(defaultProviders,index+1);
-         }
-       }
-       return false;
-     }
- 
- 
- 
  
      private String[] getActivePaths(Vector paths) {
--- 230,233 ----
***************
*** 341,344 ****
--- 316,322 ----
          if(name.equals("midl")) {
            return DevStudioMIDLCompiler.getInstance();
+         }
+         if(name.equals("df")) {
+           return CompaqVisualFortranCompiler.getInstance();
          }
          Processor processor = createProcessor(name);

Index: LinkerDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/LinkerDef.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** LinkerDef.java	10 Apr 2002 04:31:53 -0000	1.14
--- LinkerDef.java	11 Apr 2002 05:34:41 -0000	1.15
***************
*** 56,60 ****
  import net.sf.antcontrib.cpptasks.compiler.LinkerConfiguration;
  import net.sf.antcontrib.cpptasks.types.LibrarySet;
- import net.sf.antcontrib.cpptasks.types.SystemLibrarySet;
  import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
  import net.sf.antcontrib.cpptasks.gcc.GccLinker;
--- 56,59 ----
***************
*** 65,68 ****
--- 64,68 ----
  import org.apache.tools.ant.BuildException;
  import net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker;
+ import net.sf.antcontrib.cpptasks.compaq.CompaqVisualFortranLinker;
  
  import java.util.*;
***************
*** 83,93 ****
      private Boolean fixed;
      private String entry;
!     private LinkType linkType;
! 
  
      public LinkerDef() {
          base = -1;
          stack = -1;
-         linkType = LinkType.EXECUTABLE;
      }
  
--- 83,91 ----
      private Boolean fixed;
      private String entry;
!     private Boolean incremental;
  
      public LinkerDef() {
          base = -1;
          stack = -1;
      }
  
***************
*** 115,119 ****
       * Adds a system library set.
       */
!     public void addSyslibset(SystemLibrarySet libset)
      {
          if(isReference()) {
--- 113,117 ----
       * Adds a system library set.
       */
!     public void addSyslibset(LibrarySet libset)
      {
          if(isReference()) {
***************
*** 146,150 ****
          linker = GccLinker.getInstance();
        }
-       linker = linker.getLinker(linkType);
        return linker;
      }
--- 144,147 ----
***************
*** 198,201 ****
--- 195,205 ----
      }
  
+     public void setIncremental(boolean incremental) {
+       if ( isReference() ) {
+           throw tooManyAttributes();
+       }
+       this.map = booleanValueOf(incremental);
+     }
+ 
      public void setFixed(boolean fixed) {
        if ( isReference() ) {
***************
*** 240,254 ****
      }
  
!     public void setLinkType(LinkType linkType) {
!       if(linkType == null) {
!         throw new NullPointerException("linkType");
        }
!       //
!       //   this property is context based, so
!       //       independent of whether linker is
!       //       a reference
!       this.linkType = linkType;
      }
  
  
      public void visitUserLibraries(Linker linker,FileVisitor libraryVisitor) {
--- 244,335 ----
      }
  
!     public boolean getIncremental(LinkerDef[] defaultProviders, int index) {
!       if(isReference()) {
!             return ((LinkerDef)getCheckedRef(LinkerDef.class, "LinkerDef")).
!                 getIncremental(defaultProviders,index);
        }
!       if(incremental != null) {
!         return incremental.booleanValue();
!       }
!       if(defaultProviders != null && index < defaultProviders.length) {
!         defaultProviders[index].getIncremental(defaultProviders,index+1);
!       }
!       return false;
!     }
! 
! 
!     /**
!      * Returns an array of active library sets for this linker definition.
!      */
!     public LibrarySet[] getActiveLibrarySets(LinkerDef[] defaultProviders, int index) {
!       if (isReference()) {
!             return ((LinkerDef)getCheckedRef(LinkerDef.class, "LinkerDef")).
!                 getActiveUserLibrarySets(defaultProviders,index);
!       }
!       Vector libsets = new Vector();
!       for(int i = index; i < defaultProviders.length; i++) {
!         defaultProviders[i].addActiveUserLibrarySets(project,libsets);
!         defaultProviders[i].addActiveSystemLibrarySets(project,libsets);
!       }
!       addActiveUserLibrarySets(project,libsets);
!       addActiveSystemLibrarySets(project,libsets);
!       LibrarySet[] sets = new LibrarySet[libsets.size()];
!       libsets.copyInto(sets);
!       return sets;
!     }
! 
!     /**
!      * Returns an array of active library sets for this linker definition.
!      */
!     public LibrarySet[] getActiveUserLibrarySets(LinkerDef[] defaultProviders, int index) {
!       if (isReference()) {
!             return ((LinkerDef)getCheckedRef(LinkerDef.class, "LinkerDef")).
!                 getActiveUserLibrarySets(defaultProviders,index);
!       }
!       Vector libsets = new Vector();
!       for(int i = index; i < defaultProviders.length; i++) {
!         defaultProviders[i].addActiveUserLibrarySets(project,libsets);
!       }
!       addActiveUserLibrarySets(project,libsets);
!       LibrarySet[] sets = new LibrarySet[libsets.size()];
!       libsets.copyInto(sets);
!       return sets;
!     }
! 
!     /**
!      * Returns an array of active library sets for this linker definition.
!      */
!     public LibrarySet[] getActiveSystemLibrarySets(LinkerDef[] defaultProviders, int index) {
!       if (isReference()) {
!             return ((LinkerDef)getCheckedRef(LinkerDef.class, "LinkerDef")).
!                 getActiveUserLibrarySets(defaultProviders,index);
!       }
!       Vector libsets = new Vector();
!       for(int i = index; i < defaultProviders.length; i++) {
!         defaultProviders[i].addActiveSystemLibrarySets(project,libsets);
!       }
!       addActiveSystemLibrarySets(project,libsets);
!       LibrarySet[] sets = new LibrarySet[libsets.size()];
!       libsets.copyInto(sets);
!       return sets;
      }
  
+     private void addActiveSystemLibrarySets(Project project, Vector libsets) {
+       addActiveLibrarySet(project,libsets,sysLibrarySets);
+     }
+ 
+     private void addActiveUserLibrarySets(Project project, Vector libsets) {
+       addActiveLibrarySet(project,libsets,librarySets);
+     }
+ 
+     private void addActiveLibrarySet(Project project, Vector libsets, Vector srcSets) {
+       Enumeration srcenum = srcSets.elements();
+       while (srcenum.hasMoreElements()) {
+         LibrarySet set = (LibrarySet) srcenum.nextElement();
+         if (set.isActive(project)) {
+           libsets.addElement(set);
+         }
+       }
+     }
  
      public void visitUserLibraries(Linker linker,FileVisitor libraryVisitor) {
***************
*** 261,264 ****
--- 342,356 ----
        }
        else {
+         //
+         //   if this linker extends another,
+         //      visit its libraries first
+         //
+         LinkerDef extendsDef = (LinkerDef) getExtends();
+         if(extendsDef != null) {
+           visitUserLibraries(linker,libraryVisitor);
+         }
+         //
+         //   visit the user libraries
+         //
          File[] libpath = new File[0];
          for(int i = 0; i < librarySets.size(); i++) {
***************
*** 281,284 ****
--- 373,384 ----
        }
        else {
+         //
+         //   if this linker extends another,
+         //      visit its libraries first
+         //
+         LinkerDef extendsDef = (LinkerDef) getExtends();
+         if(extendsDef != null) {
+           visitSystemLibraries(linker,libraryVisitor);
+         }
          File[] libpath = linker.getLibraryPath();
          for(int i = 0; i < sysLibrarySets.size(); i++) {
***************
*** 309,313 ****
            return GccLinker.getInstance();
          }
!         Processor processor =  createProcessor(name);
          if(processor == null || processor instanceof Linker) {
              return (Linker) processor;
--- 409,416 ----
            return GccLinker.getInstance();
          }
!         if(name.equals("df")) {
!           return CompaqVisualFortranLinker.getInstance();
!         }
!         Processor processor = createProcessor(name);
          if(processor == null || processor instanceof Linker) {
              return (Linker) processor;
***************
*** 317,321 ****
  
  
!      public ProcessorConfiguration createConfiguration(ProcessorDef baseDef) {
         //
         //    must combine some local context (the linkType)
--- 420,425 ----
  
  
!      public ProcessorConfiguration createConfiguration(
!         CCTask task, ProcessorDef baseDef) {
         //
         //    must combine some local context (the linkType)
***************
*** 330,340 ****
         //    find the appropriate processor (combines local linkType
         //       with possibly remote linker name)
!        Processor proc = getProcessor();
  
         ProcessorDef[] defaultProviders = getDefaultProviders(baseDef);
!        return proc.createConfiguration(defaultProviders,thisDef);
       }
- 
- 
  
  }
--- 434,442 ----
         //    find the appropriate processor (combines local linkType
         //       with possibly remote linker name)
!        Processor proc = getProcessor().getLinker(task.getLinkType());
  
         ProcessorDef[] defaultProviders = getDefaultProviders(baseDef);
!        return proc.createConfiguration(task, defaultProviders,thisDef);
       }
  
  }

Index: ProcessorDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/ProcessorDef.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ProcessorDef.java	9 Apr 2002 06:50:05 -0000	1.8
--- ProcessorDef.java	11 Apr 2002 05:34:41 -0000	1.9
***************
*** 494,501 ****
       *
       */
!     public ProcessorConfiguration createConfiguration(ProcessorDef baseDef) {
        if (isReference()) {
          return ((ProcessorDef) getCheckedRef
!             (ProcessorDef.class, "ProcessorDef")).createConfiguration(baseDef);
        }
  
--- 494,502 ----
       *
       */
!     public ProcessorConfiguration createConfiguration(
!         CCTask task, ProcessorDef baseDef) {
        if (isReference()) {
          return ((ProcessorDef) getCheckedRef
!             (ProcessorDef.class, "ProcessorDef")).createConfiguration(task,baseDef);
        }
  
***************
*** 504,508 ****
        Processor proc = getProcessor();
  
!       return proc.createConfiguration(defaultProviders, this);
      }
  
--- 505,509 ----
        Processor proc = getProcessor();
  
!       return proc.createConfiguration(task, defaultProviders, this);
      }
  

--- AbstractParser.java DELETED ---

--- CParser.java DELETED ---

--- Parser.java DELETED ---

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/parser
In directory usw-pr-cvs1:/tmp/cvs-serv2058/parser

Log Message:
Directory /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/parser added to the repository

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compaq
In directory usw-pr-cvs1:/tmp/cvs-serv1943/compaq

Log Message:
Directory /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compaq added to the repository

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/testapp
In directory usw-pr-cvs1:/tmp/cvs-serv1844/testapp

Log Message:
Directory /cvsroot/ant-contrib/cpptasks/test/f-src/testapp added to the repository

Update of /cvsroot/ant-contrib/cpptasks/test/f-src/include
In directory usw-pr-cvs1:/tmp/cvs-serv1587/include

Log Message:
Directory /cvsroot/ant-contrib/cpptasks/test/f-src/include added to the repository