rename Rule::script to prepareScript

Rule might get another script besides the prepare script.
This will reduce the diff size for a future patch.

Change-Id: I28755cc0bb30d429108b63c9e9db4cc4c93573b1
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

8 files changed, 21 insertions, 21 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 6826884e6..b9e9b4583 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -554,7 +554,7 @@ void ProjectPrivate::updateInternalCodeLocations(const ResolvedProjectPtr &proje
         foreach (const GroupPtr &group, product->groups)
             updateLocationIfNecessary(group->location, changeLocation, lineOffset);
         foreach (const RulePtr &rule, product->rules) {
-            updateLocationIfNecessary(rule->script->location, changeLocation, lineOffset);
+            updateLocationIfNecessary(rule->prepareScript->location, changeLocation, lineOffset);
             foreach (const RuleArtifactPtr &artifact, rule->artifacts) {
                 for (int i = 0; i < artifact->bindings.count(); ++i) {
                     updateLocationIfNecessary(artifact->bindings[i].location, changeLocation,
diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
index ef84da432..5de52e581 100644
--- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
@@ -81,7 +81,7 @@ public slots:
         ScriptEngine * const scriptEngine = provideScriptEngine();
         QScriptValue scope = scriptEngine->newObject();
         PrepareScriptObserver observer(scriptEngine);
-        setupScriptEngineForFile(scriptEngine, transformer->rule->script->fileContext, scope);
+        setupScriptEngineForFile(scriptEngine, transformer->rule->prepareScript->fileContext, scope);
         setupScriptEngineForProduct(scriptEngine, transformer->product(), transformer->rule, scope,
                                     &observer);
         transformer->setupInputs(scriptEngine, scope);
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index 1ba53abf2..d671a029b 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -338,7 +338,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc
         ResolvedModulePtr module = ResolvedModule::create();
         module->name = rtrafo->module->name;
         rule->module = module;
-        rule->script = rtrafo->transform;
+        rule->prepareScript = rtrafo->transform;
         foreach (const SourceArtifactConstPtr &sourceArtifact, rtrafo->outputs) {
             Artifact *outputArtifact = createArtifact(product, sourceArtifact, m_logger);
             outputArtifact->artifactType = Artifact::Generated;
@@ -358,7 +358,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc
         transformer->rule = rule;
 
         RulesEvaluationContext::Scope s(evalContext().data());
-        setupScriptEngineForFile(engine(), transformer->rule->script->fileContext, scope());
+        setupScriptEngineForFile(engine(), transformer->rule->prepareScript->fileContext, scope());
         QScriptValue prepareScriptContext = engine()->newObject();
         PrepareScriptObserver observer(engine());
         setupScriptEngineForProduct(engine(), product, transformer->rule, prepareScriptContext,
@@ -366,7 +366,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc
         transformer->setupInputs(engine(), prepareScriptContext);
         transformer->setupOutputs(engine(), prepareScriptContext);
         transformer->createCommands(rtrafo->transform, evalContext(),
-                ScriptEngine::argumentList(transformer->rule->script->argumentNames,
+                ScriptEngine::argumentList(transformer->rule->prepareScript->argumentNames,
                                            prepareScriptContext));
         if (Q_UNLIKELY(transformer->commands.isEmpty()))
             throw ErrorInfo(QString("There's a transformer without commands."), rtrafo->transform->location);
diff --git a/src/lib/corelib/buildgraph/rulegraph.cpp b/src/lib/corelib/buildgraph/rulegraph.cpp
index b59edaaba..a1a0f4a3d 100644
--- a/src/lib/corelib/buildgraph/rulegraph.cpp
+++ b/src/lib/corelib/buildgraph/rulegraph.cpp
@@ -152,7 +152,7 @@ QList<RuleConstPtr> RuleGraph::topSort(const RuleConstPtr &rule, QSet<const Rule
         QString pathstr;
         foreach (const Rule *r, *rulePath) {
             pathstr += QLatin1Char('\n') + r->toString() + QLatin1Char('\t')
-                    + r->script->location.toString();
+                    + r->prepareScript->location.toString();
         }
         throw ErrorInfo(Tr::tr("Cycle detected in rule dependencies: %1").arg(pathstr));
     }
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index 8aea1f916..8a60c709e 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -69,7 +69,7 @@ void RulesApplicator::applyRule(const RuleConstPtr &rule)
     m_rule = rule;
     QScriptValue prepareScriptContext = engine()->newObject();
     PrepareScriptObserver observer(engine());
-    setupScriptEngineForFile(engine(), m_rule->script->fileContext, scope());
+    setupScriptEngineForFile(engine(), m_rule->prepareScript->fileContext, scope());
     setupScriptEngineForProduct(engine(), m_product, m_rule, prepareScriptContext, &observer);
 
     ArtifactList inputArtifacts;
@@ -193,10 +193,10 @@ void RulesApplicator::doApply(const ArtifactList &inputArtifacts,
         engine()->currentContext()->popScope();
 
     m_transformer->setupOutputs(engine(), prepareScriptContext);
-    m_transformer->createCommands(m_rule->script, evalContext(),
-            ScriptEngine::argumentList(m_rule->script->argumentNames, prepareScriptContext));
+    m_transformer->createCommands(m_rule->prepareScript, evalContext(),
+            ScriptEngine::argumentList(m_rule->prepareScript->argumentNames, prepareScriptContext));
     if (Q_UNLIKELY(m_transformer->commands.isEmpty()))
-        throw ErrorInfo(QString("There's a rule without commands: %1.").arg(m_rule->toString()), m_rule->script->location);
+        throw ErrorInfo(QString("There's a rule without commands: %1.").arg(m_rule->toString()), m_rule->prepareScript->location);
 }
 
 void RulesApplicator::setupScriptEngineForArtifact(Artifact *artifact)
@@ -258,15 +258,15 @@ Artifact *RulesApplicator::createOutputArtifact(const RuleArtifactConstPtr &rule
                    + "] -> [" + outputArtifact->fileTags.toStringList().join(", ") + "]";
 
                 e += QString("  while trying to apply:   %1:%2:%3  %4\n")
-                    .arg(m_rule->script->location.fileName())
-                    .arg(m_rule->script->location.line())
-                    .arg(m_rule->script->location.column())
+                    .arg(m_rule->prepareScript->location.fileName())
+                    .arg(m_rule->prepareScript->location.line())
+                    .arg(m_rule->prepareScript->location.column())
                     .arg(th);
 
                 e += QString("  was already defined in:  %1:%2:%3  %4\n")
-                    .arg(outputArtifact->transformer->rule->script->location.fileName())
-                    .arg(outputArtifact->transformer->rule->script->location.line())
-                    .arg(outputArtifact->transformer->rule->script->location.column())
+                    .arg(outputArtifact->transformer->rule->prepareScript->location.fileName())
+                    .arg(outputArtifact->transformer->rule->prepareScript->location.line())
+                    .arg(outputArtifact->transformer->rule->prepareScript->location.column())
                     .arg(th);
 
                 QStringList inputFilePaths;
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index 92622787f..be02b03ee 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -370,7 +370,7 @@ FileTags Rule::outputFileTags() const
 
 void Rule::load(PersistentPool &pool)
 {
-    script = pool.idLoadS<ScriptFunction>();
+    prepareScript = pool.idLoadS<ScriptFunction>();
     module = pool.idLoadS<ResolvedModule>();
     pool.stream()
         >> inputs
@@ -384,7 +384,7 @@ void Rule::load(PersistentPool &pool)
 
 void Rule::store(PersistentPool &pool) const
 {
-    pool.store(script);
+    pool.store(prepareScript);
     pool.store(module);
     pool.stream()
         << inputs
@@ -1079,7 +1079,7 @@ bool operator==(const Rule &r1, const Rule &r2)
     }
 
     return r1.module->name == r2.module->name
-            && r1.script->sourceCode == r2.script->sourceCode
+            && r1.prepareScript->sourceCode == r2.prepareScript->sourceCode
             && r1.inputs == r2.inputs
             && r1.auxiliaryInputs == r2.auxiliaryInputs
             && r1.usings == r2.usings
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index d359686b1..519a419de 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -279,7 +279,7 @@ public:
     static RulePtr create() { return RulePtr(new Rule); }
 
     ResolvedModuleConstPtr module;
-    ScriptFunctionPtr script;
+    ScriptFunctionPtr prepareScript;
     FileTags inputs;
     FileTags auxiliaryInputs;
     FileTags usings;
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 06205c7fe..05a9b3aab 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -566,7 +566,7 @@ void ProjectResolver::resolveRule(Item *item, ProjectContext *projectContext)
                            "must have alwaysUpdated set to true."),
                     item->location());
 
-    rule->script = scriptFunctionValue(item, QLatin1String("prepare"));
+    rule->prepareScript = scriptFunctionValue(item, QLatin1String("prepare"));
     rule->multiplex = m_evaluator->boolValue(item, QLatin1String("multiplex"));
     rule->inputs = m_evaluator->fileTagsValue(item, "inputs");
     rule->usings = m_evaluator->fileTagsValue(item, "usings");