[assembler] Rename symbol_name_lookup to evaluate_symbol.

Author: youngman-g

assembler/src/asmlib/ast.rs

@@ -27,7 +27,7 @@ use base::u18;
 
 use super::collections::OneOrMore;
 use super::eval::{
-    Evaluate, EvaluationContext, EvaluationFailure, HereValue, ScopeIdentifier, symbol_name_lookup,
+    Evaluate, EvaluationContext, EvaluationFailure, HereValue, ScopeIdentifier, evaluate_symbol,
 };
 use super::glyph;
 use super::listing::{Listing, ListingLine};

assembler/src/asmlib/ast/asteval.rs

@@ -183,7 +183,7 @@ impl Evaluate for SymbolOrLiteral {
     ) -> Result<Unsigned36Bit, EvaluationFailure> {
         match self {
             SymbolOrLiteral::Symbol(script, symbol_name, span) => {
-                symbol_name_lookup(symbol_name, *script, *span, ctx, scope)
+                evaluate_symbol(symbol_name, *script, *span, ctx, scope)
             }
             SymbolOrLiteral::Literal(literal_value) => literal_value.evaluate(ctx, scope),
             SymbolOrLiteral::Here(script, span) => ctx
@@ -243,7 +243,7 @@ impl Evaluate for Origin {
                 Ok(address.into())
             }
             Origin::Symbolic(span, symbol_name) => {
-                symbol_name_lookup(symbol_name, Script::Normal, *span, ctx, scope)
+                evaluate_symbol(symbol_name, Script::Normal, *span, ctx, scope)
             }
         }
     }

assembler/src/asmlib/driver/tests.rs

@@ -5,7 +5,7 @@ use super::super::ast::{
     InstructionSequence, LiteralValue, TaggedProgramInstruction, UntaggedProgramInstruction,
 };
 use super::super::collections::OneOrMore;
-use super::super::eval::{EvaluationContext, make_empty_rc_block_for_test, symbol_name_lookup};
+use super::super::eval::{EvaluationContext, evaluate_symbol, make_empty_rc_block_for_test};
 use super::super::manuscript::{ManuscriptBlock, PunchCommand, SourceFile};
 use super::super::memorymap::LocatedBlock;
 use super::super::source::Source;
@@ -54,7 +54,7 @@ fn assemble_check_symbols(
             lookup_operation: Default::default(),
         };
         let scope = ScopeIdentifier::global();
-        match symbol_name_lookup(&sym, Script::Normal, span, &mut ctx, scope) {
+        match evaluate_symbol(&sym, Script::Normal, span, &mut ctx, scope) {
             Ok(got) => {
                 if got != *expected_value {
                     panic!(

assembler/src/asmlib/eval.rs

@@ -541,7 +541,9 @@ pub(crate) fn make_empty_rc_block_for_test(location: Address) -> RcBlock {
     }
 }
 
-pub(crate) fn symbol_name_lookup<R: RcUpdater>(
+/// Evaluate a named symbol.  This factors out behaviour common to the
+/// evaluation of both symbolic origins and general symbols.
+pub(crate) fn evaluate_symbol<R: RcUpdater>(
     name: &SymbolName,
     elevation: Script,
     span: Span,