Mercurial > repos > tabletprog
comparison interp.js @ 314:d4df33596e7d
Make modules in earlier module directories take precedence over ones in later directories
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 14 Mar 2015 12:10:40 -0700 |
parents | 8511aac1ce82 |
children |
comparison
equal
deleted
inserted
replaced
313:f2aff12d8e87 | 314:d4df33596e7d |
---|---|
86 for (var dirnum in moduledirs) { | 86 for (var dirnum in moduledirs) { |
87 var results = os.system("ls", [moduledirs[dirnum]]).split('\n'); | 87 var results = os.system("ls", [moduledirs[dirnum]]).split('\n'); |
88 for (var i in results) { | 88 for (var i in results) { |
89 var tpidx = results[i].indexOf('.tp') | 89 var tpidx = results[i].indexOf('.tp') |
90 if (tpidx > 0 && tpidx == results[i].length - 3) { | 90 if (tpidx > 0 && tpidx == results[i].length - 3) { |
91 this.names[results[i].substr(0, tpidx)] = moduledirs[dirnum] + "/" + results[i]; | 91 var moduleName = results[i].substr(0, tpidx); |
92 if (!(moduleName in this.names)) { | |
93 this.names[moduleName] = moduledirs[dirnum] + "/" + results[i]; | |
94 } | |
92 } | 95 } |
93 } | 96 } |
94 } | 97 } |
95 if (!tptrue) { | 98 if (!tptrue) { |
96 tptrue = this.find('true'); | 99 tptrue = this.find('true'); |