Changeset 846 for trunk/tools/linguist/lupdate/java.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/linguist/lupdate/java.cpp (modified) (12 diffs)

trunk/tools/linguist/lupdate/java.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -51 +51 @@
 #include <QtCore/QString>
 #include <QtCore/QTextCodec>
+#include <QtCore/QCoreApplication>
+
+#include <iostream>
 
 #include <ctype.h>
 
 QT_BEGIN_NAMESPACE
+
+class LU {
+    Q_DECLARE_TR_FUNCTIONS(LUpdate)
+};
 
 enum { Tok_Eof, Tok_class, Tok_return, Tok_tr,
@@ -107 +114 @@
 static QStack<Scope*> yyScope;
 static QString yyDefaultContext;
+
+std::ostream &yyMsg(int line = 0)
+{
+    return std::cerr << qPrintable(yyFileName) << ':' << (line ? line : yyLineNo) << ": ";
+}
 
 static QChar getChar()
@@ -190 +202 @@
                         yyCh = getChar();
                         if ( yyCh == EOF ) {
-                            qFatal( "%s: Unterminated Java comment starting at"
-                                    " line %d\n",
-                                    qPrintable(yyFileName), yyLineNo );
-
+                            yyMsg() << qPrintable(LU::tr("Unterminated Java comment.\n"));
                             return Tok_Comment;
                         }
@@ -229 +238 @@
                                     int sub(yyCh.toLower().toAscii() - 87);
                                     if( sub > 15 || sub < 10) {
-                                        qFatal( "%s:%d: Invalid Unicode",
-                                            qPrintable(yyFileName), yyLineNo );
+                                        yyMsg() << qPrintable(LU::tr("Invalid Unicode value.\n"));
+                                        break;
                                     }
                                     unicode += sub;
@@ -252 +261 @@
 
                 if ( yyCh != QLatin1Char('"') )
-                    qFatal( "%s:%d: Unterminated string",
-                        qPrintable(yyFileName), yyLineNo );
+                    yyMsg() << qPrintable(LU::tr("Unterminated string.\n"));
 
                 yyCh = getChar();
@@ -366 +374 @@
             s += yyString;
         else {
-            qWarning( "%s:%d: String used in translation can only contain strings"
-                " concatenated with other strings, not expressions or numbers.",
-                qPrintable(yyFileName), yyLineNo );
+            yyMsg() << qPrintable(LU::tr(
+                "String used in translation can contain only literals"
+                " concatenated with other literals, not expressions or numbers.\n"));
             return false;
         }
@@ -476 +484 @@
             }
             else {
-                qFatal( "%s:%d: Class must be followed by a classname",
-                                          qPrintable(yyFileName), yyLineNo );
+                yyMsg() << qPrintable(LU::tr("'class' must be followed by a class name.\n"));
+                break;
             }
             while (!match(Tok_LeftBrace)) {
@@ -548 +556 @@
         case Tok_RightBrace:
             if ( yyScope.isEmpty() ) {
-                qFatal( "%s:%d: Unbalanced right brace in Java code\n",
-                        qPrintable(yyFileName), yyLineNo );
+                yyMsg() << qPrintable(LU::tr("Excess closing brace.\n"));
             }
             else
@@ -578 +585 @@
                         break;
                     default:
-                         qFatal( "%s:%d: Package keyword should be followed by com.package.name;",
-                                          qPrintable(yyFileName), yyLineNo );
+                         yyMsg() << qPrintable(LU::tr("'package' must be followed by package name.\n"));
                          break;
                 }
@@ -592 +598 @@
 
     if ( !yyScope.isEmpty() )
-        qFatal( "%s:%d: Unbalanced braces in Java code\n",
-                 qPrintable(yyFileName), yyScope.top()->line );
+        yyMsg(yyScope.top()->line) << qPrintable(LU::tr("Unbalanced opening brace.\n"));
     else if ( yyParenDepth != 0 )
-        qFatal( "%s:%d: Unbalanced parentheses in Java code\n",
-                 qPrintable(yyFileName), yyParenLineNo );
+        yyMsg(yyParenLineNo) << qPrintable(LU::tr("Unbalanced opening parenthesis.\n"));
 }
 
@@ -604 +608 @@
     QFile file(filename);
     if (!file.open(QIODevice::ReadOnly)) {
-        cd.appendError(QString::fromLatin1("Cannot open %1: %2")
-            .arg(filename, file.errorString()));
+        cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString()));
         return false;
     }