Commit 6f1f493d authored by Xavier Thompson's avatar Xavier Thompson

Change glyph for 'iso' viewpoint adaptation

parent 2575a500
...@@ -11392,8 +11392,8 @@ class ConsumeNode(ExprNode): ...@@ -11392,8 +11392,8 @@ class ConsumeNode(ExprNode):
self.type = PyrexTypes.error_type self.type = PyrexTypes.error_type
return self return self
if operand_type.is_qualified_cyp_class: if operand_type.is_qualified_cyp_class:
if operand_type.qualifier == 'iso&': if operand_type.qualifier == 'iso->':
error(self.pos, "Cannot consume iso&") error(self.pos, "Cannot consume iso->")
self.type = PyrexTypes.error_type self.type = PyrexTypes.error_type
return self return self
self.generate_runtime_check = operand_type.qualifier not in ('iso', 'iso~') self.generate_runtime_check = operand_type.qualifier not in ('iso', 'iso~')
......
...@@ -4800,7 +4800,7 @@ class ConstCypclassType(BaseType): ...@@ -4800,7 +4800,7 @@ class ConstCypclassType(BaseType):
class QualifiedCypclassType(BaseType): class QualifiedCypclassType(BaseType):
"A qualified cypclass reference" "A qualified cypclass reference"
# qualifier string the qualifier keyword: ('active' | 'iso' | 'iso~' | 'iso&' ) # qualifier string the qualifier keyword: ('active' | 'iso' | 'iso~' | 'iso->' )
subtypes = ['qual_base_type'] subtypes = ['qual_base_type']
...@@ -4814,7 +4814,7 @@ class QualifiedCypclassType(BaseType): ...@@ -4814,7 +4814,7 @@ class QualifiedCypclassType(BaseType):
'active': ('active', 'iso~'), 'active': ('active', 'iso~'),
'iso': ('iso~',), 'iso': ('iso~',),
'iso~': (), 'iso~': (),
'iso&': ('iso~',), 'iso->': ('iso~',),
'locked': ('locked', 'iso~'), 'locked': ('locked', 'iso~'),
} }
...@@ -5830,7 +5830,7 @@ def qualified_method_type(base_type, const, volatile): ...@@ -5830,7 +5830,7 @@ def qualified_method_type(base_type, const, volatile):
else: else:
return QualifiedMethodType(base_type, const, volatile) return QualifiedMethodType(base_type, const, volatile)
def viewpoint_adaptation(base_type, qualifier = 'iso&'): def viewpoint_adaptation(base_type, qualifier = 'iso->'):
# Perform viewpoint adaptation for cypclass types. # Perform viewpoint adaptation for cypclass types.
if base_type.is_qualified_cyp_class: if base_type.is_qualified_cyp_class:
return base_type return base_type
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment