Fixing the upgrade pipeline, plus some misc. fixes.

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/upgrade.nom b/tools/upgrade.nom
index 4975aad..a937e46 100755
--- a/tools/upgrade.nom
+++ b/tools/upgrade.nom
@@ -40,14 +40,16 @@ repeat:
 for %path in %args:
     for file %filename in %path:
         unless (%filename::matches "%.nom$"): do next %filename
-        %tree = (parse (read file %filename) from %filename)
+        %file = (read file %filename)
+        %code = (%NomsuCode::from (%Source %filename 1 (size of %file)) %file)
+        %tree = (%code parsed)
         %uptree = (..)
             %tree upgraded from (%start_version or (%tree.version or (Nomsu version))) to %version
         %text = "\
             ..#!/usr/bin/env nomsu -V\%version
             \(%uptree as nomsu)"
         
-        if:
+        when:
             %inplace:
                 say "Upgraded \%filename"
                 write %text to file %filename