1 files changed, 10 insertions, 6 deletions
diff --git a/template/vm.inc.tmpl b/template/vm.inc.tmpl
index 11c6d1bcf5..14b6ba3f10 100644
--- a/template/vm.inc.tmpl
+++ b/template/vm.inc.tmpl
@@ -11,19 +11,23 @@
   If you want to fix something, you must edit 'insns.def'
  */
 
-<%=
-line = 15
-vm_body.gsub(/\n|__CURRENT_LINE__|__CURRENT_FILE__/){
-  e = $&
+
+% line = _erbout.count("\n") + 1
+% @insns.each do |insn|
+<%
+line += 1
+make_insn_def(insn).split(/(__CURRENT_LINE__|__CURRENT_FILE__)/).each {|e|
+  %><%=
   case e
   when '__CURRENT_LINE__'
     line.to_s
   when '__CURRENT_FILE__'
     "vm.inc"
   else
-    line += 1
+    line += e.count("\n")
     e
   end
+  %><%
 }
 %>
-
+% end