sean-m
/
schemy
mirror of https://github.com/microsoft/schemy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from kflu/master 

Fix Microsoft/schemy/issues/7
master
Kefei Lu 2018-04-16 19:31:48 -07:00 committed by GitHub
parent 9440a83936 e99a70fec2
commit 80470b50a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/schemy/Schemy.cs
View File

@ -51,13 +51,13 @@ namespace Schemy
private IEnumerable<TextReader> GetInitializeFiles() private IEnumerable<TextReader> GetInitializeFiles()
{ {
using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("init.ss")) using (Stream stream = typeof(Interpreter).Assembly.GetManifestResourceStream("init.ss"))
using (StreamReader reader = new StreamReader(stream)) using (StreamReader reader = new StreamReader(stream))
{ {
yield return reader; yield return reader;
} }
string initFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), ".init.ss"); string initFile = Path.Combine(Path.GetDirectoryName(typeof(Interpreter).Assembly.Location), ".init.ss");
if (File.Exists(initFile)) if (File.Exists(initFile))
{ {
using (var reader = new StreamReader(initFile)) using (var reader = new StreamReader(initFile))
@ -259,18 +259,17 @@ namespace Schemy
Symbol def = (Symbol)xs[0]; Symbol def = (Symbol)xs[0];
object v = xs[1]; // sym or (sym+) object v = xs[1]; // sym or (sym+)
List<object> body = xs.Skip(2).ToList(); // expr or expr+ List<object> body = xs.Skip(2).ToList(); // expr or expr+
if (v is List<object>) if (v is List<object>) // defining function: ([define|define-macro] (f arg ...) body)
{ {
// (define (f args) body)
var args = (List<object>)v; var args = (List<object>)v;
Utils.CheckSyntax(xs, args.Count > 0); Utils.CheckSyntax(xs, args.Count > 0);
var f = args[0]; var f = args[0];
var @params = args.Skip(1).ToList(); var @params = args.Skip(1).ToList();
return expand(new List<object> { def, f, Enumerable.Concat(new object[] { Symbol.LAMBDA, @params }, body).ToList() }, false); return expand(new List<object> { def, f, Enumerable.Concat(new object[] { Symbol.LAMBDA, @params }, body).ToList() }, false);
} }
else else // defining variable: ([define|define-macro] id expr)
{ {
Utils.CheckSyntax(xs, xs.Count == 3); // (define x expr) Utils.CheckSyntax(xs, xs.Count == 3);
Utils.CheckSyntax(xs, v is Symbol); Utils.CheckSyntax(xs, v is Symbol);
var expr = expand(xs[2], false); var expr = expand(xs[2], false);
if (Symbol.DEFINE_MACRO.Equals(def)) if (Symbol.DEFINE_MACRO.Equals(def))
@ -385,6 +384,9 @@ namespace Schemy
} }
else if (Symbol.LAMBDA.Equals(exprList[0])) else if (Symbol.LAMBDA.Equals(exprList[0]))
{ {
// Two lambda forms:
// - (lambda (arg ...) body): each arg is bound to a value
// - (lambda args body): args is bound to the parameter list
Union<Symbol, List<Symbol>> parameters; Union<Symbol, List<Symbol>> parameters;
if (exprList[1] is Symbol) if (exprList[1] is Symbol)
{ {

3
src/schemy/init.ss
View File

@ -18,5 +18,4 @@
(define rest (cdr args)) (define rest (cdr args))
(define test1 (if (equal? (car first) 'else) '#t (car first))) (define test1 (if (equal? (car first) 'else) '#t (car first)))
(define expr1 (car (cdr first))) (define expr1 (car (cdr first)))
`(if ,test1 ,expr1 `(if ,test1 ,expr1 (cond ,@rest))))))
(cond ,@rest))))))