Add Operation constructor

J-F-Liu · Jan 29, 2017 · e259ccf · e259ccf
1 parent 5210eb3
commit e259ccf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -32,11 +32,11 @@ let resources_id = doc.add_object(
 	])
 );
 let content = Content{operations: vec![
-	Operation{operator: "BT".into(), operands: vec![]},
-	Operation{operator: "Tf".into(), operands: vec!["F1".into(), 48.into()]},
-	Operation{operator: "Td".into(), operands: vec![100.into(), 600.into()]},
-	Operation{operator: "Tj".into(), operands: vec![String("Hello World!".as_bytes().to_vec(), StringFormat::Literal)]},
-	Operation{operator: "ET".into(), operands: vec![]},
+	Operation::new("BT", vec![]),
+	Operation::new("Tf", vec!["F1".into(), 48.into()]),
+	Operation::new("Td", vec![100.into(), 600.into()]),
+	Operation::new("Tj", vec![String("Hello World!".as_bytes().to_vec(), StringFormat::Literal)]),
+	Operation::new("ET", vec![]),
 ]};
 let content_id = doc.add_object(Stream::new(Dictionary::new(), content.encode().unwrap()));
 let page_id = doc.add_object(

diff --git a/src/content.rs b/src/content.rs
@@ -10,6 +10,15 @@ pub struct Operation {
 	pub operands: Vec<Object>,
 }
 
+impl Operation {
+	pub fn new(operator: &str, operands: Vec<Object>) -> Operation {
+		Operation{
+			operator: operator.to_string(),
+			operands: operands,
+		}
+	}
+}
+
 #[derive(Debug, Clone)]
 pub struct Content {
 	pub operations: Vec<Operation>,

diff --git a/src/creator.rs b/src/creator.rs
@@ -41,11 +41,11 @@ fn create_document() {
 		])
 	);
 	let content = Content{operations: vec![
-		Operation{operator: "BT".into(), operands: vec![]},
-		Operation{operator: "Tf".into(), operands: vec!["F1".into(), 48.into()]},
-		Operation{operator: "Td".into(), operands: vec![100.into(), 600.into()]},
-		Operation{operator: "Tj".into(), operands: vec![String("Hello World!".as_bytes().to_vec(), StringFormat::Literal)]},
-		Operation{operator: "ET".into(), operands: vec![]},
+		Operation::new("BT", vec![]),
+		Operation::new("Tf", vec!["F1".into(), 48.into()]),
+		Operation::new("Td", vec![100.into(), 600.into()]),
+		Operation::new("Tj", vec![String("Hello World!".as_bytes().to_vec(), StringFormat::Literal)]),
+		Operation::new("ET", vec![]),
 	]};
 	let content_id = doc.add_object(Stream::new(Dictionary::new(), content.encode().unwrap()));
 	let page_id = doc.add_object(