diff options
| -rw-r--r-- | src/colm.lm | 1 | ||||
| -rw-r--r-- | src/loadcolm.cc | 9 | ||||
| -rw-r--r-- | src/parsetree.h | 3 | ||||
| -rw-r--r-- | src/resolve.cc | 15 |
4 files changed, 0 insertions, 28 deletions
diff --git a/src/colm.lm b/src/colm.lm index 9f11fcc4..c5e6bf35 100644 --- a/src/colm.lm +++ b/src/colm.lm @@ -562,7 +562,6 @@ def code_factor def type_ref [region_qual id opt_repeat] :Id -| [PTR LT region_qual id opt_repeat GT] :Ptr | [LIST LT type_ref GT] :List | [MAP LT MapKeyType: type_ref MapValueType: type_ref GT] :Map | [PARSER LT type_ref GT] :Parser diff --git a/src/loadcolm.cc b/src/loadcolm.cc index 5a7fbb25..c831d57b 100644 --- a/src/loadcolm.cc +++ b/src/loadcolm.cc @@ -848,15 +848,6 @@ struct LoadColm tr = TypeRef::cons( typeRef.id().loc(), nspaceQual, id, repeatType ); break; } - case type_ref::Ptr: { - NamespaceQual *nspaceQual = walkRegionQual( typeRef.region_qual() ); - String id = typeRef.id().data(); - RepeatType repeatType = walkOptRepeat( typeRef.opt_repeat() ); - TypeRef *inner = TypeRef::cons( typeRef.id().loc(), nspaceQual, - id, repeatType ); - tr = TypeRef::cons( typeRef.id().loc(), TypeRef::Ptr, inner ); - break; - } case type_ref::List: { TypeRef *type = walkTypeRef( typeRef._type_ref() ); tr = TypeRef::cons( typeRef.loc(), TypeRef::List, 0, type, 0 ); diff --git a/src/parsetree.h b/src/parsetree.h index 0beb2e76..345d86a1 100644 --- a/src/parsetree.h +++ b/src/parsetree.h @@ -570,7 +570,6 @@ struct TypeMapEl enum Type { AliasType = 1, - ContextType, LangElType, StructType }; @@ -1951,7 +1950,6 @@ struct TypeRef MapEl, Parser, Ref, - Ptr, }; TypeRef() @@ -2128,7 +2126,6 @@ struct TypeRef UniqueType *resolveTypeParserObj( Compiler *pd ); UniqueType *resolveTypeParser( Compiler *pd ); UniqueType *resolveType( Compiler *pd ); - UniqueType *resolveTypePtr( Compiler *pd ); UniqueType *resolveTypeRef( Compiler *pd ); diff --git a/src/resolve.cc b/src/resolve.cc index 5f04cb3a..af36f6c8 100644 --- a/src/resolve.cc +++ b/src/resolve.cc @@ -46,15 +46,8 @@ UniqueType *TypeRef::resolveTypeName( Compiler *pd ) return inDict->typeRef->resolveType( pd ); } - case TypeMapEl::ContextType: { - UniqueType *structUt = pd->findUniqueType( TYPE_TREE, inDict->value ); - return pd->findUniqueType( TYPE_PTR, structUt->langEl ); - } - case TypeMapEl::LangElType: { UniqueType *ut = pd->findUniqueType( TYPE_TREE, inDict->value ); - if ( ut == pd->uniqueTypeStream ) - return pd->findUniqueType( TYPE_PTR, ut->langEl ); return ut; } case TypeMapEl::StructType: { @@ -263,11 +256,6 @@ UniqueType *TypeRef::resolveTypeParser( Compiler *pd ) * End object based list/map */ -UniqueType *TypeRef::resolveTypePtr( Compiler *pd ) -{ - typeRef1->resolveType( pd ); - return pd->findUniqueType( TYPE_PTR, typeRef1->uniqueType->langEl ); -} UniqueType *TypeRef::resolveTypeRef( Compiler *pd ) { @@ -372,9 +360,6 @@ UniqueType *TypeRef::resolveType( Compiler *pd ) case Parser: uniqueType = resolveTypeParser( pd ); break; - case Ptr: - uniqueType = resolveTypePtr( pd ); - break; case Ref: uniqueType = resolveTypeRef( pd ); break; |