Merge branch 'master' of https://github.com/findoraorg/codegen into findoraorg-master

# Conflicts:
#	tests/codegen.rs

Author: andrewleverette

src/lib.rs

@@ -48,6 +48,7 @@ pub struct Scope {
 enum Item {
     Module(Module),
     Struct(Struct),
+    Function(Function),
     Trait(Trait),
     Enum(Enum),
     Impl(Impl),
@@ -372,6 +373,22 @@ impl Scope {
         self
     }
 
+    /// Push a new function definition, returning a mutable reference to it.
+    pub fn new_fn(&mut self, name: &str) -> &mut Function {
+        self.push_fn(Function::new(name));
+
+        match *self.items.last_mut().unwrap() {
+            Item::Function(ref mut v) => v,
+            _ => unreachable!(),
+        }
+    }
+
+    /// Push a function definition
+    pub fn push_fn(&mut self, item: Function) -> &mut Self {
+        self.items.push(Item::Function(item));
+        self
+    }
+
     /// Push a new trait definition, returning a mutable reference to it.
     pub fn new_trait(&mut self, name: &str) -> &mut Trait {
         self.push_trait(Trait::new(name));
@@ -458,6 +475,7 @@ impl Scope {
             match *item {
                 Item::Module(ref v) => v.fmt(fmt)?,
                 Item::Struct(ref v) => v.fmt(fmt)?,
+                Item::Function(ref v) => v.fmt(false, fmt)?,
                 Item::Trait(ref v) => v.fmt(fmt)?,
                 Item::Enum(ref v) => v.fmt(fmt)?,
                 Item::Impl(ref v) => v.fmt(fmt)?,
@@ -623,6 +641,17 @@ impl Module {
         self
     }
 
+    /// Push a new function definition, returning a mutable reference to it.
+    pub fn new_fn(&mut self, name: &str) -> &mut Function {
+        self.scope.new_fn(name)
+    }
+
+    /// Push a function definition
+    pub fn push_fn(&mut self, item: Function) -> &mut Self {
+        self.scope.push_fn(item);
+        self
+    }
+
     /// Push a new enum definition, returning a mutable reference to it.
     pub fn new_enum(&mut self, name: &str) -> &mut Enum {
         self.scope.new_enum(name)
@@ -1509,7 +1538,7 @@ impl Import {
     }
 }
 
-// ===== impl Func =====
+// ===== impl Function =====
 
 impl Function {
     /// Return a new function definition.

tests/codegen.rs

@@ -1,6 +1,6 @@
 extern crate codegen;
 
-use codegen::{Field, Scope, Struct, Variant};
+use codegen::*;
 #[test]
 fn empty_scope() {
     let scope = Scope::new();
@@ -83,6 +83,25 @@ struct Foo {
     assert_eq!(scope.to_string(), &expect[1..]);
 }
 
+#[test]
+fn single_fn() {
+    let mut scope = Scope::new();
+    scope.new_fn("my_fn")
+        .vis("pub")
+        .arg("foo", Type::new("uint"))
+        .ret(Type::new("uint"))
+        .line("let res = foo + 1;")
+        .line("res");
+
+    let expect = r#"
+pub fn my_fn(foo: uint) -> uint {
+    let res = foo + 1;
+    res
+}"#;
+
+    assert_eq!(scope.to_string(), &expect[1..]);
+}
+
 #[test]
 fn empty_struct() {
     let mut scope = Scope::new();