Add README section about global vars, rename some predefined fns

OlegTheCat · OlegTheCat · commit d5ad3664ff20 · 2019-07-22T15:43:20.000+03:00
diff --git a/README.md b/README.md
@@ -82,6 +82,25 @@ nil
 3
 ```
 
+### Global variables
+
+```
+>>> (defvar x 100)
+nil
+>>> x
+100
+
+
+>>> (defonce y 200)
+nil
+>>> y
+200
+>>> (defonce y 300)
+nil
+>>> y
+200
+```
+
 ### "Standard library"
 
 It is located in file [`stdlib.unl`](https://github.com/OlegTheCat/unlisp-llvm/blob/master/stdlib.unl).
diff --git a/stdlib.unl b/stdlib.unl
@@ -1,51 +1,51 @@
-(declare-sym true)
-(set-val (quote true) (quote true))
+(declare-var true)
+(set-symbol-value (quote true) (quote true))
 
-(set-fn (quote list) (lambda (& args) args))
+(set-symbol-function (quote list) (lambda (& args) args))
 
-(set-fn
+(set-symbol-function
  (quote list*)
  (lambda list* (& args)
    (apply (symbol-function (quote apply))
           (symbol-function (quote list)) args)))
 
-(set-fn
+(set-symbol-function
  (quote funcall)
  (lambda funcall (f & args)
    (apply f args)))
 
-(set-fn
+(set-symbol-function
  (quote emptyp)
  (lambda (list) (if list nil true)))
 
-(set-fn
+(set-symbol-function
  (quote append)
  (lambda append (x y)
    (if (emptyp x)
        y
        (cons (first x)
              (append (rest x) y)))))
 
-(set-fn
+(set-symbol-function
  (quote list*)
  (lambda list* (& args)
    (apply (symbol-function (quote apply))
           (symbol-function (quote list)) args)))
 
-(set-fn
+(set-symbol-function
  (quote funcall)
  (lambda funcall (f & args)
    (apply f args)))
 
-(set-fn
+(set-symbol-function
  (quote append)
  (lambda append (x y)
    (if (emptyp x)
        y
        (cons (first x)
              (append (rest x) y)))))
 
-(set-fn
+(set-symbol-function
  (quote reduce)
  (lambda reduce (f init list)
    (if (emptyp list)
@@ -56,7 +56,7 @@
         (rest list)))))
 
 
-(set-fn
+(set-symbol-function
  (quote reverse-inner)
  (lambda (x acc)
    (if (emptyp x)
@@ -65,39 +65,39 @@
         (rest x)
         (cons (first x) acc)))))
 
-(set-fn
+(set-symbol-function
  (quote reverse)
  (lambda reverse (x)
    (reverse-inner x ())))
 
-(set-fn
+(set-symbol-function
  (quote not)
  (lambda not (x)
-   (if x nil (quote true))))
+   (if x nil true)))
 
 
-(set-fn
+(set-symbol-function
  (quote unq)
  (lambda unq (x)
    (error "unq outside of qquote")))
 
 (set-macro (symbol-function (quote unq)))
 
-(set-fn
+(set-symbol-function
  (quote unqs)
  (lambda unqs (x)
    (error "unqs outside of qquote")))
 
 (set-macro (symbol-function (quote unqs)))
 
-(set-fn
+(set-symbol-function
  (quote qquote)
  (lambda quote (x)
    (qquote-process x)))
 
 (set-macro (symbol-function (quote qquote)))
 
-(set-fn
+(set-symbol-function
  (quote qquote-process)
  (lambda qquote-process (x)
    (if (not (listp x))
@@ -112,12 +112,12 @@
                        (error "unqs after qquote")
                        (qquote-transform-list x))))))))
 
-(set-fn
+(set-symbol-function
  (quote qquote-transform-list)
  (lambda qquote-transform-list (x)
    (qquote-transform-list-inner x ())))
 
-(set-fn
+(set-symbol-function
  (quote qquote-transform-list-inner)
  (lambda qquote-transform-list-inner (x transformed-acc)
    (if (emptyp x)
@@ -129,7 +129,7 @@
         (cons (qquote-transform-list-item (first x))
               transformed-acc)))))
 
-(set-fn
+(set-symbol-function
  (quote qquote-transform-list-item)
  (lambda qquote-transform-list-item (x)
    (if (not (listp x))
@@ -142,13 +142,13 @@
                    (first (rest x))
                    (list (quote list) (qquote-process x))))))))
 
-(set-fn
+(set-symbol-function
  (quote defmacro)
  (lambda defmacro (name args & body)
    (qquote
     (let ((--macro-fn (lambda (unq name) (unq args)
                         (unqs body))))
-      (set-fn
+      (set-symbol-function
        (quote (unq name))
        --macro-fn)
       (set-macro --macro-fn)))))
@@ -157,7 +157,7 @@
 
 (defmacro defun (name args & body)
   (qquote
-   (set-fn
+   (set-symbol-function
     (quote (unq name))
     (lambda (unq name) (unq args)
       (unqs body)))))
@@ -200,7 +200,7 @@
 
 (defmacro and (& forms)
   (let ((reversed (if (emptyp forms)
-                      (list (quote true))
+                      (list true)
                       (reverse forms))))
     (reduce
      (lambda (acc form)
@@ -310,8 +310,8 @@
 (defmacro defvar (sym val)
   (qquote
    (let ()
-     (declare-sym (unq sym))
-     (set-val (quote (unq sym))
+     (declare-var (unq sym))
+     (set-symbol-value (quote (unq sym))
               (unq val)))))
 
 (defmacro defonce (sym val)
diff --git a/unlisp_rt/src/predefined.rs b/unlisp_rt/src/predefined.rs
@@ -430,7 +430,7 @@ pub fn init() {
     init_symbol_fn(
         native_set_fn_invoke as *const c_void,
         native_set_fn_apply as *const c_void,
-        "set-fn",
+        "set-symbol-function",
         &["sym", "func"],
         false,
     );
@@ -540,7 +540,7 @@ pub fn init() {
     init_symbol_fn(
         native_set_val_invoke as *const c_void,
         native_set_val_apply as *const c_void,
-        "set-val",
+        "set-symbol-value",
         &["sym", "val"],
         false,
     );
diff --git a/unlispc/src/codegen/closure.rs b/unlispc/src/codegen/closure.rs
@@ -13,7 +13,7 @@ use super::top_level::compile_hirs;
 use std::iter;
 
 fn is_global_name(ctx: &CodegenContext, name: &String) -> bool {
-    ctx.lookup_local_name(name).is_none() && ctx.is_global_sym(name)
+    ctx.lookup_local_name(name).is_none() && ctx.is_global_var(name)
 }
 
 fn codegen_raw_fn(ctx: &mut CodegenContext, closure: &Closure) -> GenResult<FunctionValue> {
diff --git a/unlispc/src/codegen/context.rs b/unlispc/src/codegen/context.rs
@@ -107,11 +107,11 @@ impl<'a> CodegenContext<'a> {
         self.str_literal_globals = HashMap::new();
     }
 
-    pub fn declare_global_sym(&mut self, name: &String) {
+    pub fn declare_global_var(&mut self, name: &String) {
         self.declared_syms.insert(name.clone());
     }
 
-    pub fn is_global_sym(&self, name: &String) -> bool {
+    pub fn is_global_var(&self, name: &String) -> bool {
         self.declared_syms.get(name).is_some()
     }
 
diff --git a/unlispc/src/codegen/top_level.rs b/unlispc/src/codegen/top_level.rs
@@ -20,8 +20,8 @@ pub fn compile_hir(ctx: &mut CodegenContext, hir: &HIR) -> CompileResult {
         HIR::If(if_hir) => compile_if(ctx, if_hir),
         HIR::Quote(quote) => compile_quoted_literal(ctx, &quote.body),
         HIR::LetBlock(let_block) => compile_let_block(ctx, let_block),
-        HIR::DeclareSym(decl_s) => {
-            ctx.declare_global_sym(&decl_s.var_name);
+        HIR::DeclareVar(decl_var) => {
+            ctx.declare_global_var(&decl_var.var_name);
             Ok(compile_nil_literal(ctx))
         }
     }
diff --git a/unlispc/src/repr.rs b/unlispc/src/repr.rs
@@ -72,7 +72,7 @@ pub struct Call {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-pub struct DeclareSym {
+pub struct DeclareVar {
     pub var_name: String,
 }
 
@@ -87,7 +87,7 @@ pub enum Literal {
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum HIR {
-    DeclareSym(DeclareSym),
+    DeclareVar(DeclareVar),
     Literal(Literal),
     Lambda(Lambda),
     Closure(Closure),
@@ -312,25 +312,25 @@ fn forms_to_hir(forms: &Vec<Form>) -> Result<HIR, Box<dyn Error>> {
 
                 Ok(HIR::Lambda(lambda))
             }
-            Form::Symbol(s) if is(s, "declare-sym") => {
+            Form::Symbol(s) if is(s, "declare-var") => {
                 let sym = forms
                     .get(1)
-                    .ok_or_else(|| error::Error::new_syntax_error("no symbol in declare-sym"))?;
+                    .ok_or_else(|| error::Error::new_syntax_error("no symbol in declare-var"))?;
                 let sym = to_symbol(sym)
-                    .ok_or_else(|| error::Error::new_syntax_error("not a symbol in declare-sym"))?;
+                    .ok_or_else(|| error::Error::new_syntax_error("not a symbol in declare-var"))?;
 
                 if forms.get(2).is_some() {
                     Err(error::Error::new_syntax_error(format!(
-                        "wrong number of arguments ({}) passed to declare-sym",
+                        "wrong number of arguments ({}) passed to declare-var",
                         forms.len() - 1
                     )))?
                 }
 
-                let decl_s = DeclareSym {
+                let decl_var = DeclareVar {
                     var_name: sym.clone(),
                 };
 
-                Ok(HIR::DeclareSym(decl_s))
+                Ok(HIR::DeclareVar(decl_var))
             }
             Form::Symbol(s) => unsafe {
                 let call_sym = symbols::get_or_intern_symbol(s.clone());
@@ -480,7 +480,7 @@ fn convert_lambda_body_item(
 
             HIR::If(converted)
         }
-        HIR::DeclareSym(decl_s) => HIR::DeclareSym(decl_s.clone())
+        HIR::DeclareVar(decl_var) => HIR::DeclareVar(decl_var.clone()),
     }
 }
 
@@ -550,7 +550,7 @@ pub fn convert_into_closures(hir: &HIR) -> HIR {
             HIR::If(converted)
         }
 
-        HIR::DeclareSym(decl_s) => HIR::DeclareSym(decl_s.clone())
+        HIR::DeclareVar(decl_var) => HIR::DeclareVar(decl_var.clone()),
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ use super::top_level::compile_hirs;`
`13`	`13`	`use std::iter;`
`14`	`14`
`15`	`15`	`fn is_global_name(ctx: &CodegenContext, name: &String) -> bool {`
`16`		`- ctx.lookup_local_name(name).is_none() && ctx.is_global_sym(name)`
	`16`	`+ ctx.lookup_local_name(name).is_none() && ctx.is_global_var(name)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`fn codegen_raw_fn(ctx: &mut CodegenContext, closure: &Closure) -> GenResult<FunctionValue> {`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ impl<'a> CodegenContext<'a> {`
`107`	`107`	`self.str_literal_globals = HashMap::new();`
`108`	`108`	`}`
`109`	`109`
`110`		`- pub fn declare_global_sym(&mut self, name: &String) {`
	`110`	`+ pub fn declare_global_var(&mut self, name: &String) {`
`111`	`111`	`self.declared_syms.insert(name.clone());`
`112`	`112`	`}`
`113`	`113`
`114`		`- pub fn is_global_sym(&self, name: &String) -> bool {`
	`114`	`+ pub fn is_global_var(&self, name: &String) -> bool {`
`115`	`115`	`self.declared_syms.get(name).is_some()`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ pub fn compile_hir(ctx: &mut CodegenContext, hir: &HIR) -> CompileResult {`
`20`	`20`	`HIR::If(if_hir) => compile_if(ctx, if_hir),`
`21`	`21`	`HIR::Quote(quote) => compile_quoted_literal(ctx, &quote.body),`
`22`	`22`	`HIR::LetBlock(let_block) => compile_let_block(ctx, let_block),`
`23`		`- HIR::DeclareSym(decl_s) => {`
`24`		`- ctx.declare_global_sym(&decl_s.var_name);`
	`23`	`+ HIR::DeclareVar(decl_var) => {`
	`24`	`+ ctx.declare_global_var(&decl_var.var_name);`
`25`	`25`	`Ok(compile_nil_literal(ctx))`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ pub struct Call {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`#[derive(Debug, PartialEq, Eq, Clone)]`
`75`		`-pub struct DeclareSym {`
	`75`	`+pub struct DeclareVar {`
`76`	`76`	`pub var_name: String,`
`77`	`77`	`}`
`78`	`78`
`@@ -87,7 +87,7 @@ pub enum Literal {`
`87`	`87`
`88`	`88`	`#[derive(Debug, PartialEq, Eq, Clone)]`
`89`	`89`	`pub enum HIR {`
`90`		`- DeclareSym(DeclareSym),`
	`90`	`+ DeclareVar(DeclareVar),`
`91`	`91`	`Literal(Literal),`
`92`	`92`	`Lambda(Lambda),`
`93`	`93`	`Closure(Closure),`
`@@ -312,25 +312,25 @@ fn forms_to_hir(forms: &Vec<Form>) -> Result<HIR, Box<dyn Error>> {`
`312`	`312`
`313`	`313`	`Ok(HIR::Lambda(lambda))`
`314`	`314`	`}`
`315`		`- Form::Symbol(s) if is(s, "declare-sym") => {`
	`315`	`+ Form::Symbol(s) if is(s, "declare-var") => {`
`316`	`316`	`let sym = forms`
`317`	`317`	`.get(1)`
`318`		`- .ok_or_else(\|\| error::Error::new_syntax_error("no symbol in declare-sym"))?;`
	`318`	`+ .ok_or_else(\|\| error::Error::new_syntax_error("no symbol in declare-var"))?;`
`319`	`319`	`let sym = to_symbol(sym)`
`320`		`- .ok_or_else(\|\| error::Error::new_syntax_error("not a symbol in declare-sym"))?;`
	`320`	`+ .ok_or_else(\|\| error::Error::new_syntax_error("not a symbol in declare-var"))?;`
`321`	`321`
`322`	`322`	`if forms.get(2).is_some() {`
`323`	`323`	`Err(error::Error::new_syntax_error(format!(`
`324`		`- "wrong number of arguments ({}) passed to declare-sym",`
	`324`	`+ "wrong number of arguments ({}) passed to declare-var",`
`325`	`325`	`forms.len() - 1`
`326`	`326`	`)))?`
`327`	`327`	`}`
`328`	`328`
`329`		`- let decl_s = DeclareSym {`
	`329`	`+ let decl_var = DeclareVar {`
`330`	`330`	`var_name: sym.clone(),`
`331`	`331`	`};`
`332`	`332`
`333`		`- Ok(HIR::DeclareSym(decl_s))`
	`333`	`+ Ok(HIR::DeclareVar(decl_var))`
`334`	`334`	`}`
`335`	`335`	`Form::Symbol(s) => unsafe {`
`336`	`336`	`let call_sym = symbols::get_or_intern_symbol(s.clone());`
`@@ -480,7 +480,7 @@ fn convert_lambda_body_item(`
`480`	`480`
`481`	`481`	`HIR::If(converted)`
`482`	`482`	`}`
`483`		`- HIR::DeclareSym(decl_s) => HIR::DeclareSym(decl_s.clone())`
	`483`	`+ HIR::DeclareVar(decl_var) => HIR::DeclareVar(decl_var.clone()),`
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`
`@@ -550,7 +550,7 @@ pub fn convert_into_closures(hir: &HIR) -> HIR {`
`550`	`550`	`HIR::If(converted)`
`551`	`551`	`}`
`552`	`552`
`553`		`- HIR::DeclareSym(decl_s) => HIR::DeclareSym(decl_s.clone())`
	`553`	`+ HIR::DeclareVar(decl_var) => HIR::DeclareVar(decl_var.clone()),`
`554`	`554`	`}`
`555`	`555`	`}`
`556`	`556`