Joe Groff
							
						 | 
						
							
							
							
							
								
							
								3fbe722561
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://factorcode.org/git/factor
							
							
							
							
							
							
							
							Conflicts:
	basis/locals/locals.factor
	basis/peg/peg.factor
	extra/infix/infix.factor 
							
						 | 
						
							2009-10-28 16:17:24 -05:00 | 
						
					
				
					
						
							
							
								 
								Doug Coleman
							
						 | 
						
							
							
							
							
								
							
								93de179c2f
								
							
								
							
						 | 
						
							
							
								
								over push -> suffix!, over push-all -> append!
							
							
							
							
							
						 | 
						
							2009-10-28 15:29:01 -05:00 | 
						
					
				
					
						
							
							
								 
								Joe Groff
							
						 | 
						
							
							
							
							
								
							
								935c0797c3
								
							
								
							
						 | 
						
							
							
								
								update existing code for [let change
							
							
							
							
							
						 | 
						
							2009-10-27 22:05:37 -05:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								0c1e519dcb
								
							
								
							
						 | 
						
							
							
								
								Rename use+ to add-use, move search to vocabs.parser, EXCLUDE: bombs out if word doesn't exist
							
							
							
							
							
						 | 
						
							2009-05-13 22:15:48 -05:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								99b8400e56
								
							
								
							
						 | 
						
							
							
								
								Documentation updates
							
							
							
							
							
						 | 
						
							2009-04-06 03:00:46 -05:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								ea60f8ae93
								
							
								
							
						 | 
						
							
							
								
								Changing : foo ; parsing to SYNTAX: foo ;
							
							
							
							
							
						 | 
						
							2009-03-21 01:27:50 -05:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								6b25e99470
								
							
								
							
						 | 
						
							
							
								
								Add summary for heaps more vocabs
							
							
							
							
							
						 | 
						
							2009-02-16 21:05:13 -06:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								1c65b61f80
								
							
								
							
						 | 
						
							
							
								
								Make interpolate-locals public again
							
							
							
							
							
						 | 
						
							2009-01-26 02:39:15 -06:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								7360cd5b30
								
							
								
							
						 | 
						
							
							
								
								Clean up some duplication in interpolate
							
							
							
							
							
						 | 
						
							2009-01-25 23:04:19 -06:00 | 
						
					
				
					
						
							
							
								 
								Slava Pestov
							
						 | 
						
							
							
							
							
								
							
								d70c8eff1c
								
							
								
							
						 | 
						
							
							
								
								Rewrite interpolate without using PEGs for mad lulz
							
							
							
							
							
						 | 
						
							2008-12-04 02:26:34 -06:00 | 
						
					
				
					
						
							
							
								 
								Doug Coleman
							
						 | 
						
							
							
							
							
								
							
								62a8d45c0e
								
							
								
							
						 | 
						
							
							
								
								add interpolate
							
							
							
							
							
						 | 
						
							2008-10-01 18:15:41 -05:00 |