Changed Slice parser to disallow leading underscore for identifiers.

    Changed Slice parser to reject identifiers beginning with "Ice", unless
    the --ice option is used. Changed Slice parser to disallow identifiers
    that have a trailing "Operations", "Holder", "Helper", "Prx", or "Ptr",
    to avoid clashes with language mappings. Fixed tests and remaining code
    base to work correctly with the changed rules.

5 files changed, 14 insertions, 14 deletions

diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index f522f246d65..c5400db0aae 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -53,7 +53,7 @@ public class Client
         readline(in);
 
         Simple simple = initial.getSimple();
-        System.out.println("==> " + simple._message);
+        System.out.println("==> " + simple.message);
 
         System.out.println();
         System.out.println("Ok, this worked. Now let's try to transfer an object for a class");
@@ -84,7 +84,7 @@ public class Client
         communicator.addObjectFactory(factory, "::Printer");
 
         initial.getPrinter(printer, printerProxy);
-        System.out.println("==> " + printer.value._message);
+        System.out.println("==> " + printer.value.message);
 
         System.out.println();
         System.out.println("Cool, it worked! Let's try calling the printBackwards() method");
@@ -143,7 +143,7 @@ public class Client
         System.out.println("[press enter]");
         readline(in);
 
-        System.out.println("==> " + derived._derivedMessage);
+        System.out.println("==> " + derived.derivedMessage);
         System.out.print("==> ");
         derived.printUppercase(null);
 
@@ -164,7 +164,7 @@ public class Client
             assert(derived != null);
         }
 
-        System.out.println("==> " + derived._derivedMessage);
+        System.out.println("==> " + derived.derivedMessage);
         System.out.print("==> ");
         derived.printUppercase(null);
 
diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java
index 26f1ffdf53d..8504f0d9d57 100644
--- a/java/demo/Ice/value/DerivedPrinterI.java
+++ b/java/demo/Ice/value/DerivedPrinterI.java
@@ -13,7 +13,7 @@ class DerivedPrinterI extends DerivedPrinter
     public void
     printBackwards(Ice.Current current)
     {
-        char[] arr = _message.toCharArray();
+        char[] arr = message.toCharArray();
         for(int i = 0; i < arr.length / 2; i++)
         {
             char tmp = arr[arr.length - i - 1];
@@ -26,6 +26,6 @@ class DerivedPrinterI extends DerivedPrinter
     public void
     printUppercase(Ice.Current current)
     {
-        System.out.println(_derivedMessage.toUpperCase());
+        System.out.println(derivedMessage.toUpperCase());
     }
 }
diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java
index e4c9940e4e5..53137458fa5 100644
--- a/java/demo/Ice/value/InitialI.java
+++ b/java/demo/Ice/value/InitialI.java
@@ -15,16 +15,16 @@ class InitialI extends Initial
         _adapter = adapter;
 
         _simple = new Simple();
-        _simple._message = "a message 4 u";
+        _simple.message = "a message 4 u";
 
         _printer = new PrinterI();
-        _printer._message = "Ice rulez!";
+        _printer.message = "Ice rulez!";
         _printerProxy =
             PrinterPrxHelper.uncheckedCast(adapter.addWithUUID(_printer));
 
         _derivedPrinter = new DerivedPrinterI();
-        _derivedPrinter._message = _printer._message;
-        _derivedPrinter._derivedMessage = "Coming soon: the ultimate online " +
+        _derivedPrinter.message = _printer.message;
+        _derivedPrinter.derivedMessage = "Coming soon: the ultimate online " +
             "game from MutableRealms!";
         adapter.addWithUUID(_derivedPrinter);
     }
diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java
index cb50b62fbec..deec1858606 100644
--- a/java/demo/Ice/value/PrinterI.java
+++ b/java/demo/Ice/value/PrinterI.java
@@ -13,7 +13,7 @@ class PrinterI extends Printer
     public void
     printBackwards(Ice.Current current)
     {
-        char[] arr = _message.toCharArray();
+        char[] arr = message.toCharArray();
         for(int i = 0; i < arr.length / 2; i++)
         {
             char tmp = arr[arr.length - i - 1];
diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice
index 8dbe0e42b88..4c5c860ecf7 100644
--- a/java/demo/Ice/value/Value.ice
+++ b/java/demo/Ice/value/Value.ice
@@ -13,18 +13,18 @@
 
 class Simple
 {
-    string _message;
+    string message;
 };
 
 class Printer
 {
-    string _message;
+    string message;
     void printBackwards();
 };
 
 class DerivedPrinter extends Printer
 {
-    string _derivedMessage;
+    string derivedMessage;
     void printUppercase();
 };