Comparison

tools/erlparse.lua @ 490:9087f39b4222

Another automatic merge, this gets annoying."
author Tobias Markmann <tm@ayena.de>
date Sat, 29 Nov 2008 22:11:21 +0100
parent 489:237cddb1a785
child 519:cccd610a0ef9
comparison
equal deleted inserted replaced
488:328135f63ea3 490:9087f39b4222
96 return readNumber(); 96 return readNumber();
97 elseif ch == "\"" then 97 elseif ch == "\"" then
98 return readString(); 98 return readString();
99 elseif ch == "<" then 99 elseif ch == "<" then
100 return readSpecialString(); 100 return readSpecialString();
101 elseif isSpace(ch) or ch == "," then 101 elseif isSpace(ch) or ch == "," or ch == "|" then
102 read(); 102 read();
103 return readItem(); 103 return readItem();
104 else 104 else
105 --print("Unknown char: "..ch); 105 --print("Unknown char: "..ch);
106 return nil; 106 return nil;