From 7108f38ff1f4de2d5e8fdf7f62043feb8433bf79 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 10 Mar 2010 16:00:46 +0000 Subject: [PATCH] .uppdev git-svn-id: svn://ultimatepp.org/upp/trunk@2208 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppdev/CParserb/CParserb.cpp | 22 ++++++++++------------ uppdev/CParserb/CParserb.upp | 18 ++++++++++-------- uppdev/CParserb/test.txt | 9 +++++++++ 3 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 uppdev/CParserb/test.txt diff --git a/uppdev/CParserb/CParserb.cpp b/uppdev/CParserb/CParserb.cpp index fcf3d3ac0..eb658abc2 100644 --- a/uppdev/CParserb/CParserb.cpp +++ b/uppdev/CParserb/CParserb.cpp @@ -2,18 +2,16 @@ using namespace Upp; -int compactcommandline() -/**/{ - int goo; - - go - -int i,j; -} - -void MyTest() {} - CONSOLE_APP_MAIN { - MyTes(*) + String s = LoadFile(GetDataFile("test.txt")); + CParser p(s); + while(!p.IsEof()) { + if(p.IsId()) { + CParser::Pos pos = p.GetPos(); + DLOG(p.ReadId() << ": " << pos.line << ", " << pos.GetColumn()); + } + else + p.SkipTerm(); + } } diff --git a/uppdev/CParserb/CParserb.upp b/uppdev/CParserb/CParserb.upp index f613264ad..0f94ec950 100644 --- a/uppdev/CParserb/CParserb.upp +++ b/uppdev/CParserb/CParserb.upp @@ -1,8 +1,10 @@ -uses - Core; - -file - CParserb.cpp optimize_speed; - -mainconfig - "" = ""; +uses + Core; + +file + test.txt, + CParserb.cpp optimize_speed; + +mainconfig + "" = ""; + diff --git a/uppdev/CParserb/test.txt b/uppdev/CParserb/test.txt new file mode 100644 index 000000000..068fd639a --- /dev/null +++ b/uppdev/CParserb/test.txt @@ -0,0 +1,9 @@ +id1 a045905 id2 + tab1 +x tab2 +xx tab3 +xxx tab4 +xxxx tab5 +xxxxx tab6 + t7 ta9 ta10 t11 + t12