summaryrefslogtreecommitdiff
path: root/src/ctinput.cc
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2013-12-29 12:41:39 -0500
committerAdrian Thurston <thurston@complang.org>2013-12-29 12:41:39 -0500
commit465e29f50c7899913a0f71ba82b46de31da42e87 (patch)
tree8e29daf59822c5d99aa85afb82a64220f0be7c6f /src/ctinput.cc
parent60e968ec6ce8144d097fcf18eb576e096512a5ad (diff)
downloadcolm-465e29f50c7899913a0f71ba82b46de31da42e87.tar.gz
dead code removal, name name improvements
Diffstat (limited to 'src/ctinput.cc')
-rw-r--r--src/ctinput.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ctinput.cc b/src/ctinput.cc
index 178cb585..d2e4c7de 100644
--- a/src/ctinput.cc
+++ b/src/ctinput.cc
@@ -254,7 +254,7 @@ LangEl *inputStreamConsGetLangEl( StreamImpl *ss, long *bindId, char **data, lon
*data = 0;
*length = 0;
- if ( ss->consItem->type == ConsItem::FactorType ) {
+ if ( ss->consItem->type == ConsItem::LiteralType ) {
if ( ss->consItem->prodEl->typeRef->pdaLiteral != 0 ) {
bool unusedCI;
prepareLitString( ss->consItem->data, unusedCI,
@@ -283,7 +283,7 @@ int inputStreamConsGetParseBlock( StreamImpl *ss,
if ( buf == 0 )
return INPUT_EOD;
- if ( buf->type == ConsItem::ExprType || buf->type == ConsItem::FactorType )
+ if ( buf->type == ConsItem::ExprType || buf->type == ConsItem::LiteralType )
return INPUT_LANG_EL;
assert ( buf->type == ConsItem::InputText );
@@ -330,7 +330,7 @@ int inputStreamConsGetData( StreamImpl *ss, char *dest, int length )
if ( buf == 0 )
break;
- if ( buf->type == ConsItem::ExprType || buf->type == ConsItem::FactorType )
+ if ( buf->type == ConsItem::ExprType || buf->type == ConsItem::LiteralType )
break;
assert ( buf->type == ConsItem::InputText );