From c6bfd97a53e9387f1a5a17e924db33b5941b0a8b Mon Sep 17 00:00:00 2001
From: "pedemont%us.ibm.com"
 <pedemont%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 27 Sep 2006 15:09:24 +0000
Subject: [PATCH] Bug 327846 - Method names conflicting with Java keywords
 should have underscore prepended, not appended.  Expand list of Java
 keywords.  General cleanup. r=bsmedberg.  xulrunner only

Original committer: pedemont%us.ibm.com
Original revision: 1.4
Original date: 2006/03/30 22:31:56


git-svn-id: svn://10.0.0.236/trunk@212494 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../java/xpcom/interfaces/gen-nsError.pl           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mozilla/extensions/java/xpcom/interfaces/gen-nsError.pl b/mozilla/extensions/java/xpcom/interfaces/gen-nsError.pl
index a7e3692d01e..2a98955c481 100644
--- a/mozilla/extensions/java/xpcom/interfaces/gen-nsError.pl
+++ b/mozilla/extensions/java/xpcom/interfaces/gen-nsError.pl
@@ -106,33 +106,35 @@ while (<STDIN>) {
   if (/^\s*#define\s+(NS_[A-Z_]+)\s+(0x)?([0-9a-fA-F]+)\s*$/) {
     #define NS_ERROR_MODULE_XPCOM      1
     #define NS_ERROR_MODULE_BASE_OFFSET 0x45
-    print "  public static final long $1 = $2$3L;\n";
+    print "  long $1 = $2$3L;\n";
   }
   elsif (/^\s*#define\s+(NS_[A-Z_]+)\s+\((NS_[A-Z_]+)\s+\+\s+(0x)?([0-9a-fA-F]+)\s*\)\s*/) {
     #define NS_ERROR_NOT_INITIALIZED           (NS_ERROR_BASE + 1)
     #define NS_ERROR_FACTORY_EXISTS            (NS_ERROR_BASE + 0x100)
-    print "  public static final long $1 = $2 + $3$4L;\n";
+    print "  long $1 = $2 + $3$4L;\n";
   }
   elsif (/^\s*#define\s+(NS_[A-Z_]+)\s+(NS_[A-Z_]+)\s\s*/) {
     #define NS_ERROR_NO_INTERFACE              NS_NOINTERFACE
-    print "  public static final long $1 = $2;\n";
+    print "  long $1 = $2;\n";
   }
   elsif (/^\s*#define\s+(NS_[A-Z_]+)\s+\(\(nsresult\)\s*(0x)?([0-9a-fA-F]+)L?\)\s*$/) { 
     #define NS_ERROR_BASE                      ((nsresult) 0xC1F30000)
     #define NS_ERROR_ABORT                     ((nsresult) 0x80004004L)
-    print "  public static final long $1 = $2$3L;\n";
+    print "  long $1 = $2$3L;\n";
   }
   elsif (/^\s*#define\s+(NS_[A-Z_]+)\s+NS_ERROR_GENERATE_FAILURE\s*\(\s*(NS_[A-Z_]+)\s*,\s*([0-9]+)\s*\)\s*$/) { 
     #define NS_BASE_STREAM_CLOSED         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 2)
     $module = $2;
     $code = $3;
-    print "  public static final long $1 = ((NS_ERROR_SEVERITY_ERROR<<31) | (($module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | $code);\n";
+    print "  long $1 = ((NS_ERROR_SEVERITY_ERROR<<31) |\n";
+    print "      (($module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | $code);\n";
   }
   elsif (/^\s*#define\s+(NS_[A-Z_]+)\s+NS_ERROR_GENERATE_SUCCESS\s*\(\s*(NS_[A-Z_]+)\s*,\s*([0-9]+)\s*\)\s*$/) { 
     #define NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA   NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM,  1)
     $module = $2;
     $code = $3;
-    print "  public static final long $1 = ((NS_ERROR_SEVERITY_SUCCESS<<31) | (($module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | $code);\n";
+    print "  long $1 = ((NS_ERROR_SEVERITY_SUCCESS<<31) |\n";
+    print "      (($module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | $code);\n";
   }
   elsif (/^\s*\/\*(.*)\*\/\s*$/ && !/^\s*\/\*@[\{\}]\*\/\s*$/ &&
          !/^\s*\/\*\ -\*- Mode:/) {