vrd/tft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "multiline comment by adam(gts@volconst.com)"

Browse Source 
This reverts commit 783576d150.
This commit is contained in:
vrd
2023-04-22 13:30:30 +03:00
parent 783576d150
commit 81fc94d472
2 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example_tree.tft
-3
View File
@@ -1,9 +1,6 @@
# This is a comment # This is a comment
# The dating in this tree is according to the Byzantine calendar but relative to Christ's birth # The dating in this tree is according to the Byzantine calendar but relative to Christ's birth
/* This is a multiline
comment with a * and a / in it */
Adam Adam
b: -5509.9.06 # Birthday in format yyyy.mm.dd b: -5509.9.06 # Birthday in format yyyy.mm.dd
src/parser.cpp
+10 -34
View File
@@ -143,11 +143,11 @@ namespace /* internal */
/* [[noreturn]]void err_thirdParent(const string& extra_name) */ /* [[noreturn]]void err_thirdParent(const string& extra_name) */
/* { */ /* { */
/* endwin(); */ /* endwin(); */
/* cerr << "Line " << line << ": two parents are already defined, " */ /* cerr << "Line " << line << ": two parents are already defined, " */
/* << extra_name << " is third\n"; */ /* << extra_name << " is third\n"; */
/* cerr.flush(); */ /* cerr.flush(); */
/* exit(1); */ /* exit(1); */
/* } */ /* } */
[[noreturn]]void err_personUndefined(const string& name) [[noreturn]]void err_personUndefined(const string& name)
@@ -172,11 +172,11 @@ namespace /* internal */
/* void err_name_index(const string& name, U32 i) */ /* void err_name_index(const string& name, U32 i) */
/* { */ /* { */
/* endwin(); */ /* endwin(); */
/* cerr << "Line " << line << " the number given after the declaration of a person can" */ /* cerr << "Line " << line << " the number given after the declaration of a person can" */
/* " only be his place among the same named. " << i << " doesn't satisfy this for '" */ /* " only be his place among the same named. " << i << " doesn't satisfy this for '" */
/* << name << '\'' << endl; */ /* << name << '\'' << endl; */
/* exit(1); */ /* exit(1); */
/* } */ /* } */
bool isNum(char c) bool isNum(char c)
@@ -567,30 +567,6 @@ namespace /* internal */
--it; --it;
break; break;
/* case '0' ... '9': */ /* case '0' ... '9': */
case '/':
if(it+1<end)
{
if(it[1]=='/')
{
if(token_begin < it)
tokens.emplace_back(token_begin, it);
while(++it < end && *it != '\n'); /* skip comment */
token_begin = it;
--it;
}
else if(it[1]=='*')
{
if(token_begin < it)
tokens.emplace_back(token_begin, it);
while(++it < end)
if(*it=='*' && it+1<end && it[1]=='/')
break;
it+=2;
token_begin = it;
--it;
}
}
break;
default: break; default: break;
} }