From 2a146714966bd978a6097d41ab8a2eefebc7b69c Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Thu, 23 May 2019 00:46:43 +0200
Subject: [PATCH] Renamed for clarity

---
 .../kickc/passes/Pass1FixLValuesLoHi.java     |  2 +-
 .../kickc/passes/PassNTypeInference.java      | 22 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java b/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java
index 68d13d0e3..1e65038e9 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java
@@ -79,7 +79,7 @@ public class Pass1FixLValuesLoHi extends Pass1Base {
       VariableIntermediate tmpVar = currentScope.addVariableIntermediate();
       VariableRef tmpVarRef = tmpVar.getRef();
       statementLValue.setlValue(tmpVarRef);
-      PassNTypeInference.inferLValue(getProgram(), statementLValue);
+      PassNTypeInference.updateInferedTypeLValue(getProgram(), statementLValue);
       // Insert an extra "set low" assignment statement
       Statement setLoHiAssignment = new StatementAssignment(loHiVar, loHiVar, loHiOperator, tmpVarRef, statementLValue.getSource(), new ArrayList<>());
       statementsIt.add(setLoHiAssignment);
diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNTypeInference.java b/src/main/java/dk/camelot64/kickc/passes/PassNTypeInference.java
index 365829e6a..4e135e916 100644
--- a/src/main/java/dk/camelot64/kickc/passes/PassNTypeInference.java
+++ b/src/main/java/dk/camelot64/kickc/passes/PassNTypeInference.java
@@ -15,7 +15,6 @@ import dk.camelot64.kickc.model.values.VariableRef;
 
 /**
  * Pass through the generated statements inferring types of unresolved variables.
- * Also updates procedure calls to point to the actual procedure called.
  */
 public class PassNTypeInference extends Pass2SsaOptimization {
 
@@ -23,17 +22,16 @@ public class PassNTypeInference extends Pass2SsaOptimization {
       super(program);
    }
 
-
    @Override
    public boolean step() {
       for(ControlFlowBlock block : getGraph().getAllBlocks()) {
          for(Statement statement : block.getStatements()) {
             try {
                if(statement instanceof StatementLValue) {
-                  inferLValue(getProgram(), (StatementLValue) statement);
+                  updateInferedTypeLValue(getProgram(), (StatementLValue) statement);
                } else if(statement instanceof StatementPhiBlock) {
                   for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
-                     inferPhiVariable(getProgram(), phiVariable);
+                     updateInferedTypePhiVariable(getProgram(), phiVariable);
                   }
                }
             } catch(CompileError e) {
@@ -44,20 +42,20 @@ public class PassNTypeInference extends Pass2SsaOptimization {
       return false;
    }
 
-   public static void inferLValue(Program program, StatementLValue statementLValue) {
+   static void updateInferedTypeLValue(Program program, StatementLValue statementLValue) {
       if(statementLValue instanceof StatementAssignment) {
-         inferAssignmentLValue(program, (StatementAssignment) statementLValue);
+         updateInferedTypeAssignmentLValue(program, (StatementAssignment) statementLValue);
       } else if(statementLValue instanceof StatementCall) {
-         inferCallLValue(program, (StatementCall) statementLValue);
+         updateInferedTypeCallLValue(program, (StatementCall) statementLValue);
       } else if(statementLValue instanceof StatementCallPointer) {
-         inferCallPointerLValue(program, (StatementCallPointer) statementLValue);
+         updateInferedTypeCallPointerLValue(program, (StatementCallPointer) statementLValue);
       } else {
          throw new RuntimeException("LValue statement not implemented " + statementLValue);
       }
    }
 
 
-   private static void inferCallLValue(Program program, StatementCall call) {
+   private static void updateInferedTypeCallLValue(Program program, StatementCall call) {
       ProgramScope programScope = program.getScope();
       LValue lValue = call.getlValue();
       if(lValue instanceof VariableRef) {
@@ -70,7 +68,7 @@ public class PassNTypeInference extends Pass2SsaOptimization {
       }
    }
 
-   private static void inferCallPointerLValue(Program program, StatementCallPointer call) {
+   private static void updateInferedTypeCallPointerLValue(Program program, StatementCallPointer call) {
       ProgramScope programScope = program.getScope();
       LValue lValue = call.getlValue();
       if(lValue instanceof VariableRef) {
@@ -85,7 +83,7 @@ public class PassNTypeInference extends Pass2SsaOptimization {
       }
    }
 
-   private static void inferPhiVariable(Program program, StatementPhiBlock.PhiVariable phiVariable) {
+   private static void updateInferedTypePhiVariable(Program program, StatementPhiBlock.PhiVariable phiVariable) {
       ProgramScope programScope = program.getScope();
       Variable symbol = programScope.getVariable(phiVariable.getVariable());
       if(SymbolType.VAR.equals(symbol.getType()) || SymbolType.NUMBER.equals(symbol.getType())) {
@@ -109,7 +107,7 @@ public class PassNTypeInference extends Pass2SsaOptimization {
       }
    }
 
-   private static void inferAssignmentLValue(Program program, StatementAssignment assignment) {
+   private static void updateInferedTypeAssignmentLValue(Program program, StatementAssignment assignment) {
       ProgramScope programScope = program.getScope();
       LValue lValue = assignment.getlValue();
       if(lValue instanceof VariableRef) {