diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-05-14 00:15:43 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-05-14 00:15:43 +0000 |
commit | 11bb98ba5b1e9e88053a7bd6adc1d48d48a4bb21 (patch) | |
tree | 1c975ba91df4f5ffcee6b53d164d00e1181b83c8 /src/expr/declaration_scope.cpp | |
parent | 8d54316e7ff784a8d66da9ecc2d289ab463761c2 (diff) |
add AscriptionType stuff to support nullary parameterized datatypes; also, review of Andy's earlier commit, with some minor code clean-up and documentation
Diffstat (limited to 'src/expr/declaration_scope.cpp')
-rw-r--r-- | src/expr/declaration_scope.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expr/declaration_scope.cpp b/src/expr/declaration_scope.cpp index 79accf43a..ae91efa68 100644 --- a/src/expr/declaration_scope.cpp +++ b/src/expr/declaration_scope.cpp @@ -144,10 +144,10 @@ Type DeclarationScope::lookupType(const std::string& name, Debug("sort") << "instance is " << instantiation << endl; return instantiation; - }else if( p.second.isDatatype() ){ - Assert( DatatypeType( p.second ).isParametric() ); + } else if(p.second.isDatatype()) { + Assert( DatatypeType(p.second).isParametric() ); return DatatypeType(p.second).instantiate(params); - }else { + } else { if(Debug.isOn("sort")) { Debug("sort") << "instantiating using a sort substitution" << endl; Debug("sort") << "have formals ["; @@ -170,7 +170,7 @@ Type DeclarationScope::lookupType(const std::string& name, } } -size_t DeclarationScope::lookupArity( const std::string& name ){ +size_t DeclarationScope::lookupArity(const std::string& name) { pair<vector<Type>, Type> p = (*d_typeMap->find(name)).second; return p.first.size(); } |