commit 1e99fa381d1cee782d4480f04c19302f6852091b
author David Tolnay <dtolnay@gmail.com> Wed May 08 16:18:36 2019 -0700
committer David Tolnay <dtolnay@gmail.com> Wed May 08 18:47:13 2019 -0700
tree 74f6275e296abe5b2fd9dd2a122ee0710ba3177b
parent 1db3d8e76d9fca9502335c1b3382e51f1da9f464

Factor out generate loops

codegen/src/fold.rs

diff --git a/codegen/src/fold.rs b/codegen/src/fold.rs
index 3bc0036..adcde21 100644
--- a/codegen/src/fold.rs
+++ b/codegen/src/fold.rs
@@ -1,10 +1,11 @@
-use crate::{file, full};
+use crate::{file, full, gen};
 use quote::quote;
 use syn_codegen as types;
 
 const FOLD_SRC: &str = "../src/gen/fold.rs";
 
 mod codegen {
+    use crate::gen;
     use inflections::Inflect;
     use proc_macro2::{Span, TokenStream};
     use quote::{quote, TokenStreamExt};
@@ -166,7 +167,7 @@
                     },
                 )
             }
-            types::Type::Ext(t) if super::TERMINAL_TYPES.contains(&&t[..]) => {
+            types::Type::Ext(t) if gen::TERMINAL_TYPES.contains(&&t[..]) => {
                 Some(simple_visit(t, name))
             }
             types::Type::Ext(_) | types::Type::Std(_) => None,
@@ -288,7 +289,7 @@
         }
 
         let include_fold_impl = match &s.data {
-            types::Data::Private => super::TERMINAL_TYPES.contains(&s.ident.as_str()),
+            types::Data::Private => gen::TERMINAL_TYPES.contains(&s.ident.as_str()),
             types::Data::Struct(_) | types::Data::Enum(_) => true,
         };
 
@@ -312,22 +313,8 @@
     }
 }
 
-const TERMINAL_TYPES: &[&str] = &["Span", "Ident"];
-
 pub fn generate(defs: &types::Definitions) {
-    let mut state = codegen::State::default();
-    for s in &defs.types {
-        codegen::generate(&mut state, s, defs);
-    }
-    for tt in TERMINAL_TYPES {
-        let s = types::Node {
-            ident: tt.to_string(),
-            features: types::Features::default(),
-            data: types::Data::Private,
-        };
-        codegen::generate(&mut state, &s, defs);
-    }
-
+    let state = gen::traverse(defs, codegen::generate);
     let full_macro = full::get_macro();
     let fold_trait = state.fold_trait;
     let fold_impl = state.fold_impl;