pike.git/ src/ cpp.cmod

Branch: Tag:

2016-10-01

2016-10-01 11:07:53 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Compiler [cpp]: Reduced code duplication somewhat again.

Join find_end_of_string() and find_end_of_char() into
find_end_quote().

1276:    return pos + 2;   }    - static ptrdiff_t find_end_of_string( struct cpp *this, const PCHARP data, + static ptrdiff_t find_end_quote(struct cpp *this, const PCHARP data,    ptrdiff_t len, ptrdiff_t pos, -  int flags) +  p_wchar2 quote, int flags)   {    while(1)    { -  +  p_wchar2 c; +     if(pos>=len)    { -  +  if (quote == '\'') { +  cpp_error(this,"End of file in character constant."); +  } else {    cpp_error(this,"End of file in string."); -  +  }    break;    } -  switch(INDEX_PCHARP(data,pos++)) +  switch((c = INDEX_PCHARP(data,pos++)))    {    case '\n':    if (flags & CPP_END_AT_NEWLINE) { -  +  if (quote == '\'') { +  cpp_error(this,"Newline in char."); +  } else {    cpp_error(this,"Newline in string.");    } -  this->current_line++; -  PUTNL(); -  break; -  case '"': return pos; -  case '\\': -  if(INDEX_PCHARP(data,pos)=='\n') { -  this->current_line++; -  PUTNL(); +     } -  else if ((INDEX_PCHARP(data,pos) == '\r') && (INDEX_PCHARP(data,pos+1) == '\n')) { +     this->current_line++; -  pos++; +     PUTNL(); -  } -  pos++; -  } -  } -  return pos; - } -  - static ptrdiff_t find_end_of_char( struct cpp *this, const PCHARP data, ptrdiff_t len, ptrdiff_t pos) - { -  while(1) -  { -  if(pos>=len) -  { -  cpp_error(this,"End of file in character constant."); +     break; -  } -  switch(INDEX_PCHARP(data,pos++)) -  { -  case '\n': -  cpp_error(this,"Newline in char."); -  this->current_line++; -  PUTNL(); +  default: +  if (c == quote) return pos;    break; -  case '\'': -  return pos; +     case '\\':    if(INDEX_PCHARP(data,pos)=='\n') {    this->current_line++;    PUTNL();    } -  else if ((INDEX_PCHARP(data,pos) == '\r') && (INDEX_PCHARP(data,pos+1) == '\n')) -  { +  else if ((INDEX_PCHARP(data,pos) == '\r') && (INDEX_PCHARP(data,pos+1) == '\n')) {    this->current_line++;    pos++;    PUTNL();
1375:    switch(INDEX_PCHARP(data,pos++))    {    case '\n': PUTNL(); this->current_line++; break; -  case '\'': pos=find_end_of_char(this,data,len,pos); break; -  case '"': pos=find_end_of_string(this,data,len,pos,CPP_END_AT_NEWLINE); break; +  case '\'': pos=find_end_quote(this,data,len,pos,'\'',CPP_END_AT_NEWLINE); break; +  case '"': pos=find_end_quote(this,data,len,pos,'\"',CPP_END_AT_NEWLINE); break;    case '(': pos=find_end_parenthesis(this, data, len, pos); break;    case '{': pos=find_end_brace(this, data, len, pos); break;    case ')': return pos;
1412:    switch(INDEX_PCHARP(data,pos++))    {    case '\n': PUTNL(); this->current_line++; break; -  case '\'': pos=find_end_of_char(this,data,len,pos); break; -  case '"': pos=find_end_of_string(this,data,len,pos,CPP_END_AT_NEWLINE); break; +  case '\'': pos=find_end_quote(this,data,len,pos,'\'',CPP_END_AT_NEWLINE); break; +  case '"': pos=find_end_quote(this,data,len,pos,'\"',CPP_END_AT_NEWLINE); break;    case '{': pos=find_end_brace(this, data, len, pos); break;    case '}': return pos;    case '/':
1955:      #define CHECK_WORD(X,LEN) (begins_with(X,ADD_PCHARP(data,pos),(LEN),len-pos,1))   #define GOBBLE_WORD(X) (CHECK_WORD(X,NELEM(X)) ? (pos+=NELEM(X)),1 : 0) - #define FIND_END_OF_STRING(FLAGS) (pos=find_end_of_string(this,data,len,pos,FLAGS)) - #define FIND_END_OF_CHAR() (pos=find_end_of_char(this,data,len,pos)) + #define FIND_END_OF_STRING(FLAGS) (pos=find_end_quote(this,data,len,pos,'\"',FLAGS)) + #define FIND_END_OF_CHAR() (pos=find_end_quote(this,data,len,pos,'\'',CPP_END_AT_NEWLINE))   #define FIND_EOL_PRETEND() (pos=find_end_of_line(this,data,len,pos,0))   #define FIND_EOL() (pos=find_end_of_line(this,data,len,pos,1))   #define SKIPCOMMENT_INC_LINES() (pos=find_end_of_comment(this,data,len,pos,0))