lib/ruote/exp/fe_define.rb in ruote-2.2.0 vs lib/ruote/exp/fe_define.rb in ruote-2.3.0

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2005-2011, John Mettraux, [e-mail]
+# Copyright (c) 2005-2012, John Mettraux, [e-mail]
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
@@ -102,9 +102,11 @@
     #
     def self.reorganize(tree)
 
       definitions, bodies = tree[2].partition { |b| is_definition?(b) }
       name = tree[1]['name'] || tree[1].keys.find { |k| tree[1][k] == nil }
+
+      definitions = definitions.collect { |d| reorganize(d)[1] }
 
       [ name, [ 'define', tree[1], definitions + bodies ] ]
     end
   end
 end