From 487dd39e3483217cccb80f46e7a65674c7f6c05a Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Mon, 24 May 2010 09:51:55 -0700
Subject: bug 4752 - allow underscores in Slice identifiers

---
 java/src/ant/Slice2FreezeJTask.java | 16 ++++++++++++++++
 java/src/ant/Slice2JavaTask.java    | 16 ++++++++++++++++
 java/src/ant/SliceTask.java         |  8 ++++++++
 3 files changed, 40 insertions(+)

(limited to 'java/src')

diff --git a/java/src/ant/Slice2FreezeJTask.java b/java/src/ant/Slice2FreezeJTask.java
index 3909d30e4ae..10ff50b7163 100644
--- a/java/src/ant/Slice2FreezeJTask.java
+++ b/java/src/ant/Slice2FreezeJTask.java
@@ -243,6 +243,14 @@ public class Slice2FreezeJTask extends SliceTask
             cmd.append(" --ice");
         }
 
+        //
+        // Add --underscore
+        //
+        if(_underscore)
+        {
+            cmd.append(" --underscore");
+        }
+
         //
         // Add --output-dir
         //
@@ -371,6 +379,14 @@ public class Slice2FreezeJTask extends SliceTask
                 cmd.append(" --ice");
             }
 
+            //
+            // Add --underscore
+            //
+            if(_underscore)
+            {
+                cmd.append(" --underscore");
+            }
+
             //
             // Add include directives
             //
diff --git a/java/src/ant/Slice2JavaTask.java b/java/src/ant/Slice2JavaTask.java
index b71750599d2..f6606572a17 100644
--- a/java/src/ant/Slice2JavaTask.java
+++ b/java/src/ant/Slice2JavaTask.java
@@ -266,6 +266,14 @@ public class Slice2JavaTask extends SliceTask
                 cmd.append(" --ice");
             }
 
+            //
+            // Add --underscore
+            //
+            if(_underscore)
+            {
+                cmd.append(" --underscore");
+            }
+
             //
             // Add files to be translated
             //
@@ -311,6 +319,14 @@ public class Slice2JavaTask extends SliceTask
                 cmd.append(" --ice");
             }
 
+            //
+            // Add --underscore
+            //
+            if(_underscore)
+            {
+                cmd.append(" --underscore");
+            }
+
             //
             // Add include directives
             //
diff --git a/java/src/ant/SliceTask.java b/java/src/ant/SliceTask.java
index c405307736c..b492167be8a 100644
--- a/java/src/ant/SliceTask.java
+++ b/java/src/ant/SliceTask.java
@@ -39,6 +39,7 @@ import java.io.BufferedWriter;
  *   dependencyfile - The file in which dependencies are stored (default: ".depend").
  *   outputdir - The value for the --output-dir translator option.
  *   ice - Enables the --ice translator option.
+ *   underscore - Enables the --underscore translator option.
  *
  * Nested elements:
  *
@@ -85,6 +86,12 @@ public class SliceTask extends org.apache.tools.ant.Task
         _ice = ice;
     }
 
+    public void
+    setUnderscore(boolean underscore)
+    {
+        _underscore = underscore;
+    }
+
     public Path
     createIncludePath()
     {
@@ -540,6 +547,7 @@ public class SliceTask extends org.apache.tools.ant.Task
     protected File _outputDir;
     protected String _outputDirString;
     protected boolean _ice;
+    protected boolean _underscore;
     protected Path _includePath;
     protected java.util.List<FileSet> _fileSets = new java.util.LinkedList<FileSet>();
     protected java.util.List<SliceDefine> _defines = new java.util.LinkedList<SliceDefine>();
-- 
cgit v1.2.3