updates mplex-0.0.4

Author: frsyuki

mplex

@@ -2,7 +2,7 @@
 #
 # Mplex: Extended Metaprogramming Library
 #
-# Copyright (c) 2009 FURUHASHI Sadayuki
+# Copyright (c) 2009-2010 FURUHASHI Sadayuki
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -43,16 +43,28 @@ class Mplex
 		}
 	end
 
+	def self.file(fname, context = nil)
+		self.result(File.read(fname), context, fname)
+	end
+
+	def self.write(fname, outfname, context = nil)
+		out = self.result(File.read(fname), context, fname)
+		File.open(outfname, "w") {|f| f.write(out) }
+		out
+	end
+
 	def self.script(src)
 		compile(src)
 	end
 
 	private
 	def self.with_context(context, output, &block)
 		context ||= Object.new
+		save = context.instance_variable_get(:@_mplexout)
 		context.instance_variable_set(:@_mplexout, output)
 		block.call(context)
-		context.instance_eval { remove_instance_variable(:@_mplexout) }
+		context.instance_variable_set(:@_mplexout, save)
+		output
 	end
 
 	def self.compile(src)
@@ -73,7 +85,8 @@ class Mplex
 			c, q = t.split(/[ \t]*\%\>/,2)
 			t = "[%:(%]#{c+"\n"}[%:)#{q.strip}%]" if q
 
-			t.split(/\[\%(\:?.*?)\%\]/m).each_with_index {|m,i|
+			s = t.split(/(?:\[\%(\:?.*?)\%\]|\{\{(\:?.*?\}*)\}\})/m)
+			s.each_with_index {|m,i|
 				(o << "#{m[1..-1]};"; next) if m[0] == ?: && i % 2 == 1
 				(o << "@_mplexout.concat((#{m}).to_s);"; next) if i % 2 == 1
 				o << "@_mplexout.concat(#{m.dump});" unless m.empty?
@@ -89,7 +102,7 @@ end
 #
 # Mplex: Extended Metaprogramming Library
 #
-# Copyright (c) 2009 FURUHASHI Sadayuki
+# Copyright (c) 2009-2010 FURUHASHI Sadayuki
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -141,7 +154,9 @@ begin
 
 	finputs = ARGV
 
-	raise "multiple stdin" if (finputs + [fctx]).grep("-").size >= 2
+	if (finputs + [fctx]).select {|x| x == "-" }.size >= 2
+		raise "multiple stdin"
+	end
 
 rescue
 	usage