Skip to content

Commit 2dcecb2

Browse files
ajreynolajreynol
committed
Format
1 parent e3699da commit 2dcecb2

3 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎src/kind.cpp‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ std::ostream& operator<<(std::ostream& o, Kind k)
6767
case Kind::EVAL_IS_BOOL: o << "EVAL_IS_BOOL"; break;
6868
case Kind::EVAL_IS_VAR: o << "EVAL_IS_VAR"; break;
6969
// equality
70-
case Kind::EVAL_EQ: o << "EVAL_EQ";break;
70+
case Kind::EVAL_EQ: o << "EVAL_EQ"; break;
7171
// lists
7272
case Kind::EVAL_NIL: o << "EVAL_NIL";break;
7373
case Kind::EVAL_CONS: o << "EVAL_CONS"; break;
@@ -137,58 +137,58 @@ std::string kindToTerm(Kind k)
137137
ss << "eo::";
138138
switch (k)
139139
{
140-
case Kind::EVAL_IS_OK: ss << "is_ok"; break;
141-
case Kind::EVAL_IS_EQ: ss << "is_eq"; break;
142-
case Kind::EVAL_IF_THEN_ELSE: ss << "ite"; break;
143-
case Kind::EVAL_REQUIRES: ss << "requires"; break;
144-
case Kind::EVAL_HASH: ss << "hash"; break;
145-
case Kind::EVAL_VAR: ss << "var"; break;
146-
case Kind::EVAL_TYPE_OF: ss << "typeof"; break;
147-
case Kind::EVAL_NAME_OF: ss << "nameof"; break;
148-
case Kind::EVAL_COMPARE: ss << "cmp"; break;
149-
case Kind::EVAL_IS_Z: ss << "is_z"; break;
150-
case Kind::EVAL_IS_Q: ss << "is_q"; break;
151-
case Kind::EVAL_IS_BIN: ss << "is_bin"; break;
152-
case Kind::EVAL_IS_STR: ss << "is_str"; break;
153-
case Kind::EVAL_IS_BOOL: ss << "is_bool"; break;
154-
case Kind::EVAL_IS_VAR: ss << "is_var"; break;
155-
// equality
156-
case Kind::EVAL_EQ: ss << "eq"; break;
157-
// lists
158-
case Kind::EVAL_NIL: ss << "nil"; break;
159-
case Kind::EVAL_CONS: ss << "cons"; break;
160-
case Kind::EVAL_LIST_LENGTH: ss << "list_len"; break;
161-
case Kind::EVAL_LIST_CONCAT: ss << "list_concat"; break;
162-
case Kind::EVAL_LIST_NTH: ss << "list_nth"; break;
163-
case Kind::EVAL_LIST_FIND: ss << "list_find"; break;
164-
// boolean
165-
case Kind::EVAL_NOT: ss << "not"; break;
166-
case Kind::EVAL_AND: ss << "and"; break;
167-
case Kind::EVAL_OR: ss << "or"; break;
168-
case Kind::EVAL_XOR: ss << "xor"; break;
169-
// arithmetic
170-
case Kind::EVAL_ADD: ss << "add";break;
171-
case Kind::EVAL_NEG: ss << "neg";break;
172-
case Kind::EVAL_MUL: ss << "mul";break;
173-
case Kind::EVAL_INT_DIV: ss << "zdiv";break;
174-
case Kind::EVAL_INT_MOD: ss << "zmod";break;
175-
case Kind::EVAL_RAT_DIV: ss << "qdiv";break;
176-
case Kind::EVAL_IS_NEG: ss << "is_neg";break;
177-
case Kind::EVAL_GT: ss << "gt";break;
178-
// strings
179-
case Kind::EVAL_LENGTH: ss << "len"; break;
180-
case Kind::EVAL_CONCAT: ss << "concat"; break;
181-
case Kind::EVAL_EXTRACT: ss << "extract"; break;
182-
case Kind::EVAL_FIND: ss << "find"; break;
183-
// conversions
184-
case Kind::EVAL_TO_INT: ss << "to_z";break;
185-
case Kind::EVAL_TO_RAT: ss << "to_q";break;
186-
case Kind::EVAL_TO_BIN: ss << "to_bin";break;
187-
case Kind::EVAL_TO_STRING: ss << "to_str";break;
188-
// datatypes
189-
case Kind::EVAL_DT_CONSTRUCTORS: ss << "dt_constructors"; break;
190-
case Kind::EVAL_DT_SELECTORS: ss << "dt_selectors"; break;
191-
default:ss << "[" << k << "]";break;
140+
case Kind::EVAL_IS_OK: ss << "is_ok"; break;
141+
case Kind::EVAL_IS_EQ: ss << "is_eq"; break;
142+
case Kind::EVAL_IF_THEN_ELSE: ss << "ite"; break;
143+
case Kind::EVAL_REQUIRES: ss << "requires"; break;
144+
case Kind::EVAL_HASH: ss << "hash"; break;
145+
case Kind::EVAL_VAR: ss << "var"; break;
146+
case Kind::EVAL_TYPE_OF: ss << "typeof"; break;
147+
case Kind::EVAL_NAME_OF: ss << "nameof"; break;
148+
case Kind::EVAL_COMPARE: ss << "cmp"; break;
149+
case Kind::EVAL_IS_Z: ss << "is_z"; break;
150+
case Kind::EVAL_IS_Q: ss << "is_q"; break;
151+
case Kind::EVAL_IS_BIN: ss << "is_bin"; break;
152+
case Kind::EVAL_IS_STR: ss << "is_str"; break;
153+
case Kind::EVAL_IS_BOOL: ss << "is_bool"; break;
154+
case Kind::EVAL_IS_VAR: ss << "is_var"; break;
155+
// equality
156+
case Kind::EVAL_EQ: ss << "eq"; break;
157+
// lists
158+
case Kind::EVAL_NIL: ss << "nil"; break;
159+
case Kind::EVAL_CONS: ss << "cons"; break;
160+
case Kind::EVAL_LIST_LENGTH: ss << "list_len"; break;
161+
case Kind::EVAL_LIST_CONCAT: ss << "list_concat"; break;
162+
case Kind::EVAL_LIST_NTH: ss << "list_nth"; break;
163+
case Kind::EVAL_LIST_FIND: ss << "list_find"; break;
164+
// boolean
165+
case Kind::EVAL_NOT: ss << "not"; break;
166+
case Kind::EVAL_AND: ss << "and"; break;
167+
case Kind::EVAL_OR: ss << "or"; break;
168+
case Kind::EVAL_XOR: ss << "xor"; break;
169+
// arithmetic
170+
case Kind::EVAL_ADD: ss << "add"; break;
171+
case Kind::EVAL_NEG: ss << "neg"; break;
172+
case Kind::EVAL_MUL: ss << "mul"; break;
173+
case Kind::EVAL_INT_DIV: ss << "zdiv"; break;
174+
case Kind::EVAL_INT_MOD: ss << "zmod"; break;
175+
case Kind::EVAL_RAT_DIV: ss << "qdiv"; break;
176+
case Kind::EVAL_IS_NEG: ss << "is_neg"; break;
177+
case Kind::EVAL_GT: ss << "gt"; break;
178+
// strings
179+
case Kind::EVAL_LENGTH: ss << "len"; break;
180+
case Kind::EVAL_CONCAT: ss << "concat"; break;
181+
case Kind::EVAL_EXTRACT: ss << "extract"; break;
182+
case Kind::EVAL_FIND: ss << "find"; break;
183+
// conversions
184+
case Kind::EVAL_TO_INT: ss << "to_z"; break;
185+
case Kind::EVAL_TO_RAT: ss << "to_q"; break;
186+
case Kind::EVAL_TO_BIN: ss << "to_bin"; break;
187+
case Kind::EVAL_TO_STRING: ss << "to_str"; break;
188+
// datatypes
189+
case Kind::EVAL_DT_CONSTRUCTORS: ss << "dt_constructors"; break;
190+
case Kind::EVAL_DT_SELECTORS: ss << "dt_selectors"; break;
191+
default: ss << "[" << k << "]"; break;
192192
}
193193
}
194194
else

‎src/state.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,10 +1029,7 @@ Expr State::mkFalse()
10291029
return d_false;
10301030
}
10311031

1032-
Expr State::mkBool(bool val)
1033-
{
1034-
return val ? d_true : d_false;
1035-
}
1032+
Expr State::mkBool(bool val) { return val ? d_true : d_false; }
10361033

10371034
Expr State::mkLiteral(Kind k, const std::string& s)
10381035
{

‎src/type_checker.cpp‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,8 +1087,10 @@ Expr TypeChecker::evaluateLiteralOpInternal(
10871087
break;
10881088
case Kind::EVAL_REQUIRES:
10891089
{
1090-
// eagerly
1091-
if (args[0]->isGround() && !args[0]->isEvaluatable() && args[1]->isGround() && !args[1]->isEvaluatable() && args[0]==args[1])
1090+
// eagerly
1091+
if (args[0]->isGround() && !args[0]->isEvaluatable()
1092+
&& args[1]->isGround() && !args[1]->isEvaluatable()
1093+
&& args[0] == args[1])
10921094
{
10931095
return Expr(args[2]);
10941096
}
@@ -1115,33 +1117,34 @@ Expr TypeChecker::evaluateLiteralOpInternal(
11151117
{
11161118
case Kind::EVAL_IS_OK:
11171119
{
1118-
Assert (args.size()==1);
1120+
Assert(args.size() == 1);
11191121
// returns true or false based on whether the argument is stuck
11201122
return d_state.mkBool(!args[0]->isEvaluatable());
11211123
}
11221124
break;
11231125
case Kind::EVAL_IS_EQ:
11241126
{
1125-
Assert (args.size()==2);
1127+
Assert(args.size() == 2);
11261128
// true if both arguments are not stuck and are equal, false otherwise
11271129
// Note that (eo::is_eq t s) is equivalent to
11281130
// (eo::ite (eo::and (eo::is_ok t) (eo::is_ok s)) (eo::eq s t) false)
1129-
return d_state.mkBool(!args[0]->isEvaluatable() && !args[1]->isEvaluatable() && args[0]==args[1]);
1131+
return d_state.mkBool(!args[0]->isEvaluatable()
1132+
&& !args[1]->isEvaluatable() && args[0] == args[1]);
11301133
}
11311134
break;
11321135
case Kind::EVAL_EQ:
11331136
{
11341137
// syntactic equality, only evaluated if the terms are values
11351138
if (args[0]->isEvaluatable() && args[1]->isEvaluatable())
11361139
{
1137-
return d_state.mkBool(args[0]==args[1]);
1140+
return d_state.mkBool(args[0] == args[1]);
11381141
}
11391142
return d_null;
11401143
}
11411144
break;
11421145
case Kind::EVAL_HASH:
11431146
{
1144-
Assert (args.size()==1);
1147+
Assert(args.size() == 1);
11451148
size_t h = d_state.getHash(args[0]);
11461149
Literal lh(Integer(static_cast<unsigned int>(h)));
11471150
return Expr(d_state.mkLiteralInternal(lh));
@@ -1151,7 +1154,7 @@ Expr TypeChecker::evaluateLiteralOpInternal(
11511154
{
11521155
size_t h1 = d_state.getHash(args[0]);
11531156
size_t h2 = d_state.getHash(args[1]);
1154-
Literal lb(h1>h2);
1157+
Literal lb(h1 > h2);
11551158
return Expr(d_state.mkLiteralInternal(lb));
11561159
}
11571160
break;
@@ -1162,7 +1165,7 @@ Expr TypeChecker::evaluateLiteralOpInternal(
11621165
case Kind::EVAL_IS_BOOL:
11631166
case Kind::EVAL_IS_VAR:
11641167
{
1165-
Assert (args.size()==1);
1168+
Assert(args.size() == 1);
11661169
Kind kk;
11671170
switch (k)
11681171
{
@@ -1187,7 +1190,7 @@ Expr TypeChecker::evaluateLiteralOpInternal(
11871190
if (et.isGround())
11881191
{
11891192
// don't permit ground evaluatable types
1190-
Assert (!et.isEvaluatable());
1193+
Assert(!et.isEvaluatable());
11911194
return et;
11921195
}
11931196
return d_null;
@@ -1196,7 +1199,7 @@ Expr TypeChecker::evaluateLiteralOpInternal(
11961199
case Kind::EVAL_NAME_OF:
11971200
{
11981201
Kind k = args[0]->getKind();
1199-
if (k==Kind::CONST || k==Kind::VARIABLE)
1202+
if (k == Kind::CONST || k == Kind::VARIABLE)
12001203
{
12011204
Literal sym(String(Expr(args[0]).getSymbol()));
12021205
return Expr(d_state.mkLiteralInternal(sym));
@@ -1206,7 +1209,7 @@ Expr TypeChecker::evaluateLiteralOpInternal(
12061209
case Kind::EVAL_VAR:
12071210
{
12081211
// if arguments are ground and the first argument is a string
1209-
if (args[0]->getKind()==Kind::STRING)
1212+
if (args[0]->getKind() == Kind::STRING)
12101213
{
12111214
Expr type(args[1]);
12121215
Expr tt = getType(type);

0 commit comments

Comments
 (0)