Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@ryansg.com>2020-03-16 11:49:41 -0400
committerMike Gerwitz <mike.gerwitz@ryansg.com>2020-03-24 09:56:25 -0400
commitf969877324d5c4f5debb6646f4ff95667a92e04f (patch)
treeda79a68ca1968fd2a8c638270fe40bc8ed3c287c /tamer/src/ld
parent5fb68f9b677dff593159a9986be8da7f72b16b0d (diff)
downloadtame-f969877324d5c4f5debb6646f4ff95667a92e04f.tar.gz
tame-f969877324d5c4f5debb6646f4ff95667a92e04f.tar.bz2
tame-f969877324d5c4f5debb6646f4ff95667a92e04f.zip
[DEV-7087] TAMER: {=>Ident}Object{,State,Data}
This is essential to clarify what exactly the different object types represent with the new generic abstractions. For example, we will have expressions as an object type.
Diffstat (limited to 'tamer/src/ld')
-rw-r--r--tamer/src/ld/poc.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/tamer/src/ld/poc.rs b/tamer/src/ld/poc.rs
index 7ddfc36..904d019 100644
--- a/tamer/src/ld/poc.rs
+++ b/tamer/src/ld/poc.rs
@@ -22,7 +22,7 @@
use crate::global;
use crate::ir::asg::{
- Asg, DefaultAsg, IdentKind, Object, ObjectRef, Sections, SortableAsg,
+ Asg, DefaultAsg, IdentKind, IdentObject, ObjectRef, Sections, SortableAsg,
Source,
};
use crate::obj::xmle::writer::XmleWriter;
@@ -34,7 +34,7 @@ use std::error::Error;
use std::fs;
use std::io::BufReader;
-type LinkerAsg<'i> = DefaultAsg<'i, Object<'i>, global::ProgIdentSize>;
+type LinkerAsg<'i> = DefaultAsg<'i, IdentObject<'i>, global::ProgIdentSize>;
type LinkerObjectRef = ObjectRef<global::ProgIdentSize>;
type LoadResult<'i> =
@@ -241,7 +241,7 @@ fn load_xmlo<'a, 'i, I: Interner<'i>>(
fn get_ident<'a, 'i>(
depgraph: &'a LinkerAsg<'i>,
name: &'i Symbol<'i>,
-) -> Result<&'a Object<'i>, XmloError> {
+) -> Result<&'a IdentObject<'i>, XmloError> {
depgraph
.lookup(name)
.and_then(|id| depgraph.get(id))
@@ -251,7 +251,7 @@ fn get_ident<'a, 'i>(
fn output_xmle<'a, 'i, I: Interner<'i>>(
depgraph: &'a LinkerAsg<'i>,
interner: &'i I,
- sorted: &mut Sections<'a, Object<'i>>,
+ sorted: &mut Sections<'a, IdentObject<'i>>,
name: &'i Symbol<'i>,
relroot: String,
output: &str,