extend grammar for better version parsing support

Be more strict in parsing version numbers
This also makes it easier to access the version number in other places
using the Visitor interface, like (soon) the linter and avoids reparsing
the text twice.

Potential disadvantages: previously allowed import statements will
rejected at parse time, e.g.
import QtQuick 0b10

Potential further advantage: Weird import statements like
import QtQuick 0b10
will be rejected earlier

Change-Id: Ifcd187b79a90952bc964c688afa4ea9b158e5109
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 9d09842af4..7ed0a01cb0 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -649,11 +649,9 @@ bool IRBuilder::visit(QQmlJS::AST::UiImport *node)
         return false;
     }
 
-    if (node->versionToken.isValid()) {
-        int major, minor;
-        extractVersion(textRefAt(node->versionToken), &major, &minor);
-        import->majorVersion = major;
-        import->minorVersion = minor;
+    if (node->version) {
+        import->majorVersion = node->version->majorVersion;
+        import->minorVersion = node->version->minorVersion;
     } else if (import->type == QV4::CompiledData::Import::ImportLibrary) {
         recordError(node->importIdToken, QCoreApplication::translate("QQmlParser","Library import requires a version"));
         return false;