ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/do_file.tcl
(Generate patch)

Comparing ray/src/util/do_file.tcl (file contents):
Revision 2.13 by greg, Fri May 17 13:53:07 1996 UTC vs.
Revision 2.15 by gregl, Tue Aug 12 15:19:05 1997 UTC

# Line 73 | Line 73 | proc preen {} {                        # clean up radvar
73  
74   proc setradvar stmt {           # assign a rad variable
75          global radvar
76 <        regexp {^([a-zA-Z][a-zA-Z0-9]*) *= *(.*)$} $stmt dummy vnam vval
76 >        regexp {^([a-zA-Z][a-zA-Z0-9]*) *=[     ]*(.*)$} $stmt dummy vnam vval
77          switch -glob $vnam {
78                  obj* { eval lappend radvar(objects) $vval }
79                  sce* { eval lappend radvar(scene) $vval }
# Line 158 | Line 158 | proc load_vars {f {vl all}} {  # load RIF variables
158          if {"$vl" == "all"} {
159                  catch {unset radvar}
160                  while {[gets $fi curli] != -1} {
161 <                        if [regexp {^[a-zA-Z][a-zA-Z0-9]*= } $curli] {
161 >                        if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {
162                                  setradvar $curli
163                          } else {
164                                  break
# Line 167 | Line 167 | proc load_vars {f {vl all}} {  # load RIF variables
167                  set curmess {Project loaded.}
168          } else {
169                  foreach n $vl {
170 <                        catch {unset radvar($n)}
170 >                        if [regexp {[a-z][a-z]*} $n] {
171 >                                set radvar($n) {}
172 >                        } else {
173 >                                catch {unset radvar($n)}
174 >                        }
175                  }
176                  while {[gets $fi curli] != -1} {
177                          if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines