Commit 4d67deede1b5f58c06490f8af73c56c18fedb166 - Velo

Exceptions, rewrite attribute lookup to be more sane, method stubs. catseye 12 years ago

4 changed file(s) with 45 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all

-2

src/velo/ast.rb less more

88	88	def eval obj
89	89	debug "eval #{self}"
90	90	receiver = @receiver.eval obj
91		receiver.lookup @ident, []
	91	receiver.lookup @ident
92	92	end
93	93
94	94	def to_s

109	109	args.push(expr.eval obj)
110	110	end
111	111	method = @method_expr.eval obj
	112	debug "arguments evaluated, now calling #{@method_expr} -> #{method}"
112	113	receiver = @method_expr.find_receiver obj
113	114	if method.is_a? VeloMethod
114	115	debug "running real method #{method} w/args #{args}, receiver=#{receiver}"
115	116	method.run receiver, args
116	117	else
117		debug "just returning non-method on call #{method}"
	118	debug "just returning non-method (#{method}) on call, receiver=#{receiver}"
118	119	method
119	120	end
120	121	end

+10

-0

src/velo/exceptions.rb less more

	0	require 'velo/debug'
	1
	2	class VeloSyntaxError < StandardError
	3	end
	4
	5	class VeloAttributeNotFound < StandardError
	6	end
	7
	8	class VeloMethodNotImplemented < StandardError
	9	end

-3

src/velo/parser.rb less more

0	0	require 'velo/debug'
1	1
	2	require 'velo/exceptions'
2	3	require 'velo/scanner'
3	4	require 'velo/ast'
4	5
5	6	debug "loading parser"
6
7		class VeloSyntaxError < StandardError
8		end
9	7
10	8	# Grammar:
11	9

+31

-4

src/velo/runtime.rb less more

0	0	require 'velo/debug'
1	1
	2	require 'velo/exceptions'
2	3	require 'velo/parser'
3	4	require 'velo/ast'
4	5

50	51	end
51	52
52	53	# look up an identifier on this object, or any of its delegates
53		def lookup ident, trail
	54	def lookup ident
54	55	debug "lookup #{ident} on #{self}"
	56	result = lookup_impl ident, []
	57	debug "lookup result: #{result}"
	58	if result.nil?
	59	raise VeloAttributeNotFound, "could not locate '#{ident}' on #{self}"
	60	end
	61	result
	62	end
	63
	64	# look up an identifier on this object, or any of its delegates
	65	def lookup_impl ident, trail
	66	debug "lookup_impl #{ident} on #{self}"
55	67	if trail.include? self
56	68	debug "we've already seen this object, stopping search"
57		nil
	69	return nil
58	70	end
59	71	trail.push self
60	72	if @attrs.has_key? ident
61		debug "found here (#{self})"
	73	debug "found here (#{self}), it's #{@attrs[ident]}"
62	74	@attrs[ident]
63	75	else
64	76	x = nil
65	77	for parent in @parents
66		x = parent.lookup ident, trail
	78	x = parent.lookup_impl ident, trail
67	79	break if not x.nil?
68	80	end
69	81	x

85	97	$Object.set 'extend', VeloMethod.new('extend', proc { \|obj, args\|
86	98	obj.extend args[0]
87	99	})
	100	$Object.set 'self', VeloMethod.new('self', proc { \|obj, args\|
	101	raise VeloMethodNotImplemented
	102	})
	103	$Object.set 'new', VeloMethod.new('new', proc { \|obj, args\|
	104	raise VeloMethodNotImplemented
	105	})
88	106
89	107	$String = VeloObject.new 'String'
90	108	$String.set 'concat', VeloMethod.new('concat', proc { \|obj, args\|

92	110	obj.contents = obj.contents + args[0].contents
93	111	# XXX should this create a new object, maybe?
94	112	obj
	113	})
	114	$String.set 'class', VeloMethod.new('class', proc { \|obj, args\|
	115	raise VeloMethodNotImplemented
	116	})
	117	$String.set 'method', VeloMethod.new('method', proc { \|obj, args\|
	118	raise VeloMethodNotImplemented
	119	})
	120	$String.set 'if', VeloMethod.new('if', proc { \|obj, args\|
	121	raise VeloMethodNotImplemented
95	122	})
96	123
97	124	$IO = VeloObject.new 'IO'