bug 4752 - allow underscores in Slice identifiers

6 files changed, 94 insertions, 1 deletions

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
@@ -244,6 +244,14 @@ public class Slice2FreezeJTask extends SliceTask
         }
 
         //
+        // Add --underscore
+        //
+        if(_underscore)
+        {
+            cmd.append(" --underscore");
+        }
+
+        //
         // Add --output-dir
         //
         if(_outputDir != null)
@@ -372,6 +380,14 @@ public class Slice2FreezeJTask extends SliceTask
             }
 
             //
+            // Add --underscore
+            //
+            if(_underscore)
+            {
+                cmd.append(" --underscore");
+            }
+
+            //
             // Add include directives
             //
             if(_includePath != null)
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
@@ -267,6 +267,14 @@ public class Slice2JavaTask extends SliceTask
             }
 
             //
+            // Add --underscore
+            //
+            if(_underscore)
+            {
+                cmd.append(" --underscore");
+            }
+
+            //
             // Add files to be translated
             //
             for(File f : buildList)
@@ -312,6 +320,14 @@ public class Slice2JavaTask extends SliceTask
             }
 
             //
+            // Add --underscore
+            //
+            if(_underscore)
+            {
+                cmd.append(" --underscore");
+            }
+
+            //
             // Add include directives
             //
             if(_includePath != null)
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>();
diff --git a/java/test/Ice/translator/Metadata.ice b/java/test/Ice/translator/Metadata.ice
index 456ed18279a..e5b2a0b5ef4 100644
--- a/java/test/Ice/translator/Metadata.ice
+++ b/java/test/Ice/translator/Metadata.ice
@@ -1,3 +1,12 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 module MetadataTest
 {
     sequence<int> IntSeq;
diff --git a/java/test/Ice/translator/Underscore.ice b/java/test/Ice/translator/Underscore.ice
new file mode 100644
index 00000000000..eb3e5bff25c
--- /dev/null
+++ b/java/test/Ice/translator/Underscore.ice
@@ -0,0 +1,38 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+module Underscore_Test
+{
+    interface Test_Interface_A
+    {
+        void op_A();
+    };
+
+    class Test_Class_B implements Test_Interface_A
+    {
+        void op_B();
+
+        int int_member;
+    };
+
+    struct Test_Struct
+    {
+        string string_member;
+    };
+
+    exception Test_Exception
+    {
+        short short_member;
+    };
+
+    sequence<string> String_Sequence;
+    dictionary<string, string> String_Dictionary;
+
+    const int Const_Int = 99;
+};
diff --git a/java/test/Ice/translator/build.xml b/java/test/Ice/translator/build.xml
index fa3b299f68a..d6ea71c66d7 100644
--- a/java/test/Ice/translator/build.xml
+++ b/java/test/Ice/translator/build.xml
@@ -44,7 +44,7 @@
             <fileset dir="." includes="TestSingleModuleWithPackage12.ice"/>
             <fileset dir="." includes="TestSingleModuleWithPackage13.ice"/>
         </slice2java>
-        <!-- We use 2 tasks to limit the size of the slice2java command line -->
+        <!-- We use another task to limit the size of the slice2java command line -->
         <slice2java outputdir="${generated.dir}" tie="on" stream="on">
             <includepath>
                 <pathelement path="." />
@@ -62,6 +62,12 @@
             <fileset dir="." includes="TestDoubleModuleWithPackage10.ice"/>
             <fileset dir="." includes="TestDoubleModuleWithPackage11.ice"/>
         </slice2java>
+        <slice2java outputdir="${generated.dir}" tie="on" stream="on" underscore="on">
+            <includepath>
+                <pathelement path="." />
+            </includepath>
+            <fileset dir="." includes="Underscore.ice"/>
+        </slice2java>
     </target>
 
     <target name="compile" depends="generate">