Implement string literals

String literals are treated as integers. If a string is passed as an
integer argument to a packed binary literal, a new instance of the
packed binary literal is invoked for every character in the string,
with each character being passed to the packed binary literal as a
Unicode character value.

4 files changed, 96 insertions, 28 deletions

diff --git a/src/parsers/assembler.rs b/src/parsers/assembler.rs
index eb180e3..61e1a84 100644
--- a/src/parsers/assembler.rs
+++ b/src/parsers/assembler.rs
@@ -115,7 +115,7 @@ impl<'a> Environment<'a> {
         } else if let Some(definition) = self.macro_definitions.get(name) {
             self.reify_value(&definition.value)
         } else if let Some(label) = self.label_definitions.get(name) {
-            let name = Tracked::from(self.tag_label_name(&label.name), &source);
+            let name = Tracked::from(self.tag_label_name(&label.name), source);
             Ok(Argument::Integer(IntegerArgument::LabelReference(name)))
         } else {
             let variant = ErrVar::DefinitionNotFound(name.to_string());
@@ -142,9 +142,12 @@ impl<'a> Environment<'a> {
                         IntegerArgument::Expression(expr)
                     }
                     Integer::LabelReference(name) => {
-                        let name = Tracked::from(self.tag_label_name(name), &name.source);
+                        let name = Tracked::from(self.tag_label_name(name), name.source.clone());
                         IntegerArgument::LabelReference(name)
                     }
+                    Integer::String(string) => {
+                        IntegerArgument::String(string.clone())
+                    }
                 };
                 Ok(Argument::Integer(value))
             }
@@ -238,7 +241,7 @@ impl<'a> Environment<'a> {
             if received != expected {
                 return err!(ErrVar::IncorrectArgumentCount(expected, received));
             }
-            let name = Tracked::from(self.tag_label_name(&label.name), &label.source);
+            let name = Tracked::from(self.tag_label_name(&label.name), label.source.clone());
             Ok(Argument::Integer(IntegerArgument::LabelReference(name)))
         } else {
             err!(ErrVar::DefinitionNotFound(invocation.name.to_string()))
@@ -270,6 +273,11 @@ impl<'a> Environment<'a> {
                         IntegerArgument::Expression(expr) => {
                             AssembledExpressionToken::Expression(Box::new(expr))
                         },
+                        IntegerArgument::String(string) => {
+                            let source = string.source.clone();
+                            let variant = AssemblerErrorVariant::StringInExpression;
+                            return Err(AssemblerError { source, variant })
+                        }
                     }
                 }
                 ExprVar::Error(_) => continue,
diff --git a/src/parsers/bytecode.rs b/src/parsers/bytecode.rs
index ec19d9f..6cdfd3a 100644
--- a/src/parsers/bytecode.rs
+++ b/src/parsers/bytecode.rs
@@ -25,28 +25,7 @@ impl<'a> BytecodeGenerator<'a> {
         for token in self.tokens {
             match token {
                 AssembledToken::Word(assembled_word) => {
-                    let mut value = assembled_word.value;
-                    for field in &assembled_word.fields {
-                        let (field_value, source) = match &field.value {
-                            IntegerArgument::Expression(expr) =>
-                                (self.resolve_expression(expr), expr.source.clone()),
-                            IntegerArgument::LabelReference(name) =>
-                                (self.resolve_label_reference(name), name.source.clone()),
-                            IntegerArgument::Integer(integer) =>
-                                (integer.value, integer.source.clone()),
-                        };
-                        let bitcount = match field_value {
-                            0 => 0,
-                            _ => (field_value.ilog2() + 1) as usize,
-                        };
-                        if field.bits < bitcount {
-                            let variant = BytecodeErrorVariant::ValueTooLarge(field.bits, bitcount);
-                            self.errors.push(BytecodeError { source, variant });
-                        } else {
-                            value |= (field_value << field.shift) as usize;
-                        }
-                    }
-                    self.words.push(Word { bits: assembled_word.bits, value });
+                    self.assemble_word(assembled_word);
                 }
                 AssembledToken::PinnedAddress(pinned) => {
                     if self.words.len() > pinned.address {
@@ -74,7 +53,7 @@ impl<'a> BytecodeGenerator<'a> {
         for token in self.tokens {
             match token {
                 AssembledToken::LabelDefinition(definition) => {
-                    let address = Tracked::from(i, &definition.source);
+                    let address = Tracked::from(i, definition.source.clone());
                     if let Some(_) = self.addresses.insert(definition.name.clone(), address) {
                         let name = definition.name.clone();
                         let variant = BytecodeErrorVariant::DuplicateLabelDefinition(name);
@@ -82,8 +61,8 @@ impl<'a> BytecodeGenerator<'a> {
                         self.errors.push(BytecodeError { source, variant });
                     }
                 }
-                AssembledToken::Word(_) => {
-                    i += 1;
+                AssembledToken::Word(word) => {
+                    i += word.count();
                 }
                 AssembledToken::PinnedAddress(pinned) => {
                     i = pinned.address;
@@ -158,4 +137,53 @@ impl<'a> BytecodeGenerator<'a> {
             0
         }
     }
+
+    fn assemble_word(&mut self, assembled_word: &AssembledWord) {
+        let mut field_values = Vec::new();
+        for field in &assembled_word.fields {
+            match &field.value {
+                IntegerArgument::Expression(expr) => {
+                    let source = expr.source.clone();
+                    let value = self.resolve_expression(expr);
+                    field_values.push(vec![Tracked::from(value, source)])
+                }
+                IntegerArgument::LabelReference(name) => {
+                    let source = name.source.clone();
+                    let value = self.resolve_label_reference(name);
+                    field_values.push(vec![Tracked::from(value, source)])
+                }
+                IntegerArgument::Integer(integer) => {
+                    let source = integer.source.clone();
+                    let value = integer.value;
+                    field_values.push(vec![Tracked::from(value, source)])
+                }
+                IntegerArgument::String(string) => {
+                    let values = string.chars.iter()
+                        .map(|c| Tracked::from(c.value as isize, c.source.clone()))
+                        .collect();
+                    field_values.push(values);
+                }
+            };
+        }
+        for i in 0..assembled_word.count() {
+            let mut value = assembled_word.value;
+            for (f, field) in assembled_word.fields.iter().enumerate() {
+                let (field_value, source) = match field_values[f].get(i) {
+                    Some(tracked) => (tracked.value, Some(tracked.source.clone())),
+                    None => (0, None),
+                };
+                let bitcount = match field_value {
+                    0 => 0,
+                    _ => (field_value.ilog2() + 1) as usize,
+                };
+                if field.bits < bitcount {
+                    let variant = BytecodeErrorVariant::ValueTooLarge(field.bits, bitcount);
+                    self.errors.push(BytecodeError { source: source.unwrap(), variant });
+                } else {
+                    value |= (field_value << field.shift) as usize;
+                }
+            }
+            self.words.push(Word { bits: assembled_word.bits, value });
+        }
+    }
 }
diff --git a/src/parsers/semantic.rs b/src/parsers/semantic.rs
index a58fb5f..00cfc80 100644
--- a/src/parsers/semantic.rs
+++ b/src/parsers/semantic.rs
@@ -74,6 +74,9 @@ impl SemanticParser {
                     let invocation = InvocationParser::new(name, syn.source, &mut self.tokens).parse();
                     self.body.push(SemanticToken::Invocation(invocation));
                 }
+                SynVar::PackedBinaryLiteral(pbl) => {
+                    self.body.push(SemanticToken::Word(pbl));
+                }
                 _ => {
                     let variant = SemanticParseErrorVariant::InvalidToken;
                     let error = SemanticParseError { source: syn.source, variant };
@@ -283,6 +286,10 @@ impl<'a> InvocationParser<'a> {
                     let value = Value::Integer(Integer::Literal(integer));
                     Some(ArgumentInvocation { source, value })
                 }
+                SynVar::String(string) => {
+                    let value = Value::Integer(Integer::String(string));
+                    Some(ArgumentInvocation { source, value })
+                }
                 SynVar::Expression(expr) => {
                     let value = Value::Integer(Integer::Expression(expr));
                     Some(ArgumentInvocation { source, value })
diff --git a/src/parsers/syntactic.rs b/src/parsers/syntactic.rs
index 37f8e6c..f3fcec1 100644
--- a/src/parsers/syntactic.rs
+++ b/src/parsers/syntactic.rs
@@ -77,6 +77,21 @@ impl SyntacticParser {
                         None => SynVar::Error(SynErr::UnterminatedExpression),
                     }
                 }
+                '"' => {
+                    t.mark_child();
+                    match t.eat_to_delimiter('"') {
+                        Some(string) => {
+                            let child = t.subtokenise();
+                            t.mark_end();
+                            let chars = parse_tracked_chars(child);
+                            let tracked_string = TrackedString {
+                                source: t.get_source(), string, chars,
+                            };
+                            SynVar::String(tracked_string)
+                        }
+                        None => SynVar::Error(SynErr::UnterminatedString),
+                    }
+                }
                 '(' => match t.eat_to_delimiter(')') {
                     Some(string) => {
                         // Check if the comment fills the entire line.
@@ -145,3 +160,13 @@ impl SyntacticParser {
         return self.tokens;
     }
 }
+
+
+fn parse_tracked_chars(mut t: Tokeniser) -> Vec<Tracked<char>> {
+    let mut output = Vec::new();
+    while let Some(c) = t.eat_char() {
+        output.push(Tracked::from(c, t.get_source()));
+        t.mark_start();
+    }
+    return output;
+}