Some renaming

Rename defaultExpression to initializer, and the fix the spelling
of Initialiser to Initializer.

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

3 files changed, 15 insertions, 15 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index b891b5bbad..76cf29bf35 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -2342,12 +2342,12 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
             Reference f = referenceForName(formals->name.toString(), true);
             f.storeConsumeAccumulator();
         }
-        if (formals->defaultExpression) {
+        if (formals->initializer) {
             RegisterScope scope(this);
             Reference f = referenceForName(formals->name.toString(), true);
             f.loadInAccumulator();
             BytecodeGenerator::Jump jump = bytecodeGenerator->jumpNotUndefined();
-            expression(formals->defaultExpression).loadInAccumulator();
+            expression(formals->initializer).loadInAccumulator();
             f.storeConsumeAccumulator();
             jump.link();
         }
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index 58739bdf1e..801e9bc5f9 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -2659,7 +2659,7 @@ case $rule_number: {
 } break;
 ./
 
-VariableDeclaration: JsIdentifier InitialiserOpt ;
+VariableDeclaration: JsIdentifier InitializerOpt ;
 /.
 case $rule_number: {
   AST::VariableDeclaration::VariableScope s = AST::VariableDeclaration::FunctionScope;
@@ -2669,7 +2669,7 @@ case $rule_number: {
 } break;
 ./
 
-VariableDeclarationNotIn: JsIdentifier InitialiserNotInOpt ;
+VariableDeclarationNotIn: JsIdentifier InitializerNotInOpt ;
 /.
 case $rule_number: {
   AST::VariableDeclaration::VariableScope s = AST::VariableDeclaration::FunctionScope;
@@ -2679,7 +2679,7 @@ case $rule_number: {
 } break;
 ./
 
-Initialiser: T_EQ AssignmentExpression ;
+Initializer: T_EQ AssignmentExpression ;
 /.
 case $rule_number: {
   // ### TODO: AST for initializer
@@ -2687,16 +2687,16 @@ case $rule_number: {
 } break;
 ./
 
-InitialiserOpt: ;
+InitializerOpt: ;
 /.
 case $rule_number: {
   sym(1).Node = 0;
 } break;
 ./
 
-InitialiserOpt: Initialiser ;
+InitializerOpt: Initializer ;
 
-InitialiserNotIn: T_EQ AssignmentExpressionNotIn ;
+InitializerNotIn: T_EQ AssignmentExpressionNotIn ;
 /.
 case $rule_number: {
   // ### TODO: AST for initializer
@@ -2704,14 +2704,14 @@ case $rule_number: {
 } break;
 ./
 
-InitialiserNotInOpt: ;
+InitializerNotInOpt: ;
 /.
 case $rule_number: {
   sym(1).Node = 0;
 } break;
 ./
 
-InitialiserNotInOpt: InitialiserNotIn ;
+InitializerNotInOpt: InitializerNotIn ;
 
 EmptyStatement: T_SEMICOLON ;
 /.
@@ -3158,17 +3158,17 @@ case $rule_number: {
 ./
 
 BindingElement: SingleNameBinding ;
--- BindingElement: BindingPattern InitialiserOpt ;
+-- BindingElement: BindingPattern InitializerOpt ;
 
 -- BindingPattern: ObjectBindingPattern ;
 -- BindingPattern: ArrayBindingPattern ;
 
-SingleNameBinding: BindingIdentifier InitialiserOpt ;
+SingleNameBinding: BindingIdentifier InitializerOpt ;
 /.
 case $rule_number: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1));
   node->identifierToken = loc(1);
-  node->defaultExpression = sym(2).Expression;
+  node->initializer = sym(2).Expression;
   sym(1).Node = node;
 } break;
 ./
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index 51f3d78588..36eabec82e 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -2103,7 +2103,7 @@ public:
     {
         AST::FormalParameterList *formals = this;
         while (formals) {
-            if (formals->isRest || formals->defaultExpression)
+            if (formals->isRest || formals->initializer)
                 return false;
             formals = formals->next;
         }
@@ -2129,7 +2129,7 @@ public:
 // attributes
     QStringRef name;
     bool isRest = false;
-    ExpressionNode *defaultExpression = nullptr;
+    ExpressionNode *initializer = nullptr;
     FormalParameterList *next;
     SourceLocation identifierToken;
 };