Context Navigation

Keyed.hs

Timestamp:

06/24/05 03:59:14 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

6771

Message:

* Instead of implicitly derefercing and evaluating in rvalue

context when deriving reference types, we now simply look
at the refType for constant scalar references. This means that

sub foo ($x) { $x.ref } my %y; foo(%y);

no longer evaluates to List, but to Hash now.

* Also cleaned up related tests.

Files:

r4140	r4934
64	64	return $ map castV ((map VInt [0..]) `zip` vals)
65	65	pairsFromRef (MkRef (IScalar sv)) = do
66		refVal <- scalar_fetch sv
	66	refVal <- scalar_fetch' sv
67	67	pairsFromVal refVal
68	68	pairsFromRef ref = retError "Not a keyed reference" ref
…	…
79	79	return $ map castV keys
80	80	keysFromRef (MkRef (IScalar sv)) = do
81		refVal <- scalar_fetch sv
	81	refVal <- scalar_fetch' sv
82	82	if defined refVal
83	83	then fromVal =<< keysFromVal refVal
…	…
94	94	valuesFromRef (MkRef (IArray av)) = array_fetch av
95	95	valuesFromRef (MkRef (IScalar sv)) = do
96		refVal <- scalar_fetch sv
	96	refVal <- scalar_fetch' sv
97	97	if defined refVal
98	98	then fromVal =<< valuesFromVal refVal
…	…
108	108	array_existsElem av idx
109	109	existsFromRef (MkRef (IScalar sv)) val = do
110		refVal <- scalar_fetch sv
	110	refVal <- scalar_fetch' sv
111	111	case refVal of
112	112	VRef ref -> existsFromRef ref val
…	…
131	131	return $ VList rv
132	132	deleteFromRef (MkRef (IScalar sv)) val = do
133		refVal <- scalar_fetch sv
	133	refVal <- scalar_fetch' sv
134	134	case refVal of
135	135	VRef ref -> deleteFromRef ref val