expstorage.rb in openwferu-0.9.14

- old
+ new

@@ -28,12 +28,10 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 #++
 #
-# $Id: definitions.rb 2725 2006-06-02 13:26:32Z jmettraux $
-#
 
 #
 # "made in Japan"
 #
 # Nicolas Modrzyk at openwfe.org
@@ -114,11 +112,11 @@
                 return nil 
             end
 
             @cache[fei.hash] = fe
 
-            return fe
+            fe
         end
 
         def []= (fei, fe)
             @cache[fei.hash] = fe
         end
@@ -192,11 +190,11 @@
                 return @real_storage if @real_storage
 
                 @real_storage = 
                     @application_context[S_EXPRESSION_STORAGE + ".1"]
 
-                return @real_storage
+                @real_storage
             end
     end
         
     #
     # Memory consuming in-memory storage.
@@ -269,10 +267,12 @@
     end
 
     #
     # a small help method for expression storages...
     #
+    # TODO : put that in a module !
+    #
     def expstorage_to_s (expstorage)
 
         s = "\n\n==== #{expstorage.class} ===="
 
         expstorage.each do |k, v|
@@ -280,14 +280,15 @@
             if v.kind_of?(RawExpression)
                 s << "*raw" 
             else
                 s << "  "
             end
-            s << v.to_s
+            #s << v.to_s
+            s << v.fei.to_s
             s << "    key/value mismatch !" if k != v.fei
         end
         s << "\n==== . ====\n"
 
-        return s
+        s
     end
 
 end