ini2.patch

Jan Dolinár, 04/28/2014 06:48 PM

Download (1.38 KB)

View differences:

uppsrc/Core/Ini.cpp (working copy)
31 31 
								s++;
32 32 
							}
33 33 
							else {
34 
								while(*s == ' ')
34 
								String id;
35 
								if (*s == '{') {
36 
									while(*++s != '}')
37 
										id.Cat(*s);
35 38 
									s++;
36 
								String id;
37 
								while(iscid(*s))
38 
									id.Cat(*s++);
39 
								} else {
40 
									while(iscid(*s))
41 
										id.Cat(*s++);
42 
								}
39 43 
								hh.Cat(GetEnv(id));
40 44 
							}
41 45 
						}
autotest/LoadIniStream/LoadIniStream.cpp (working copy)
19 19 
		{ "included", "included_value" },
20 20 
		{ "delta", "delta_value" },
21 21 
		{ "etest", GetEnv("UPP_MAIN__") },
22 
		{ "braces", GetEnv("UPP_MAIN__")+"123" },
22 23 
		{ "var", "file://" + GetEnv("UPP_MAIN__") },
23 24 
	};
24 25 
	ASSERT(map.GetCount() == __countof(et));
autotest/LoadIniStream/test.ini (working copy)
17 17 

  		




  18
  18
  
    
etest=$UPP_MAIN__


  		




  19
  19
  
    

  		




  
  20
  
    
braces=${UPP_MAIN__}123


  		




  
  21
  
    

  		




  20
  22
  
    
var=file://$UPP_MAIN__


  		




  21
  23
  
    

  		




  22
  24
  
    
@end