Added -E option to Slice compilers.

1 files changed, 54 insertions, 32 deletions

diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 47d01d11993..32c3a19e18f 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -26,6 +26,7 @@ usage(const char* n)
         "-DNAME=DEF              Define NAME as DEF.\n"
         "-UNAME                  Remove any definition for NAME.\n"
         "-IDIR                   Put DIR in the include file search path.\n"
+	"-E                      Print preprocessor output on stdout.\n"
         "--output-dir DIR        Create files in the directory DIR.\n"
         "--tie                   Generate TIE classes.\n"
         "--impl                  Generate sample implementations.\n"
@@ -44,6 +45,7 @@ main(int argc, char* argv[])
 {
     string cppArgs;
     vector<string> includePaths;
+    bool preprocess;
     string output;
     bool tie;
     bool impl;
@@ -61,6 +63,7 @@ main(int argc, char* argv[])
     opts.addOpt("D", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
     opts.addOpt("U", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
     opts.addOpt("I", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
+    opts.addOpt("E");
     opts.addOpt("", "output-dir", IceUtil::Options::NeedArg);
     opts.addOpt("", "tie");
     opts.addOpt("", "impl");
@@ -118,6 +121,7 @@ main(int argc, char* argv[])
 	    cppArgs += " -I" + *i;
 	}
     }
+    preprocess = opts.isSet("E");
     if(opts.isSet("output-dir"))
     {
 	output = opts.optArg("output-dir");
@@ -170,50 +174,68 @@ main(int argc, char* argv[])
 		return EXIT_FAILURE;
 	    }
 
-	    UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive);
-	    int parseStatus = p->parse(cppHandle, debug);
-
-	    if(!icecpp.close())
-	    {
-		return EXIT_FAILURE;
-	    }	    
-	    
-	    if(parseStatus == EXIT_FAILURE)
+	    if(preprocess)
 	    {
-		status = EXIT_FAILURE;
+	        char buf[4096];
+		while(fgets(buf, sizeof(buf), cppHandle) != NULL)
+		{
+		    if(fputs(buf, stdout) == EOF)
+		    {
+		        return EXIT_FAILURE;
+		    }
+		}
+		if(!icecpp.close())
+		{
+		    return EXIT_FAILURE;
+		}
 	    }
 	    else
 	    {
-		Gen gen(argv[0], icecpp.getBaseName(), includePaths, output);
-		if(!gen)
+		UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive);
+		int parseStatus = p->parse(cppHandle, debug);
+
+		if(!icecpp.close())
 		{
 		    p->destroy();
 		    return EXIT_FAILURE;
-		}
-		gen.generate(p, stream);
-		if(tie)
+		}	    
+		
+		if(parseStatus == EXIT_FAILURE)
 		{
-		    gen.generateTie(p);
+		    status = EXIT_FAILURE;
 		}
-		if(impl)
+		else
 		{
-		    gen.generateImpl(p);
+		    Gen gen(argv[0], icecpp.getBaseName(), includePaths, output);
+		    if(!gen)
+		    {
+			p->destroy();
+			return EXIT_FAILURE;
+		    }
+		    gen.generate(p, stream);
+		    if(tie)
+		    {
+			gen.generateTie(p);
+		    }
+		    if(impl)
+		    {
+			gen.generateImpl(p);
+		    }
+		    if(implTie)
+		    {
+			gen.generateImplTie(p);
+		    }
+		    if(!checksumClass.empty())
+		    {
+			//
+			// Calculate checksums for the Slice definitions in the unit.
+			//
+			ChecksumMap m = createChecksums(p);
+			copy(m.begin(), m.end(), inserter(checksums, checksums.begin()));
+		    }
 		}
-		if(implTie)
-		{
-		    gen.generateImplTie(p);
-		}
-                if(!checksumClass.empty())
-                {
-                    //
-                    // Calculate checksums for the Slice definitions in the unit.
-                    //
-                    ChecksumMap m = createChecksums(p);
-                    copy(m.begin(), m.end(), inserter(checksums, checksums.begin()));
-                }
+		p->destroy();
 	    }
-
-	    p->destroy();
 	}
     }