Merge pull request #495 from vtereshkov/ub__self

No access to internal variables

Author: vtereshkov

README.md

@@ -18,7 +18,7 @@ Umka is a statically typed embeddable scripting language. It combines simplicity
   * [Standard library](https://github.com/vtereshkov/umka-lang/blob/master/doc/lib.md)
   * [Embedding API](https://github.com/vtereshkov/umka-lang/blob/master/doc/api.md)
 * Editor support
-  * [Sublime Text](https://github.com/vtereshkov/umka-lang/blob/master/Umka.sublime-syntax)
+  * [Sublime Text](https://github.com/vtereshkov/umka-lang/blob/master/editors/Umka.sublime-syntax)
   * [VS Code](https://marketplace.visualstudio.com/items?itemName=mrms.vscode-umka)
 * [Community](https://discord.gg/PcT7cn59h9)
 

build_linux.sh

@@ -28,11 +28,13 @@ mkdir umka_linux/examples/fractal -p
 mkdir umka_linux/examples/lisp -p
 mkdir umka_linux/examples/raytracer -p
 mkdir umka_linux/doc
+mkdir umka_linux/editors
 
 mv src/libumka* src/umka umka_linux/
-cp src/umka_api.h Umka.sublime-syntax LICENSE umka_linux/
+cp src/umka_api.h LICENSE umka_linux/
 
 cp examples/* umka_linux/examples -r
 cp doc/* umka_linux/doc
+cp editors/* umka_linux/editors
 
 echo Build finished

build_linux_mingw.sh

@@ -28,11 +28,13 @@ mkdir umka_windows_mingw/examples/fractal -p
 mkdir umka_windows_mingw/examples/lisp -p
 mkdir umka_windows_mingw/examples/raytracer -p
 mkdir umka_windows_mingw/doc
+mkdir umka_windows_mingw/editors
 
 mv src/libumka* src/umka.exe umka_windows_mingw/
-cp src/umka_api.h Umka.sublime-syntax LICENSE umka_windows_mingw/
+cp src/umka_api.h LICENSE umka_windows_mingw/
 
 cp examples/* umka_windows_mingw/examples -r
 cp doc/* umka_windows_mingw/doc
+cp editors/* umka_windows_mingw/editors
 
 echo Build finished

build_windows_mingw.bat

@@ -16,17 +16,18 @@ move /y src\libumka* umka_windows_mingw
 move /y src\umka.exe umka_windows_mingw
 copy src\umka_api.h umka_windows_mingw
 copy LICENSE umka_windows_mingw
-copy Umka.sublime-syntax umka_windows_mingw
 
 mkdir umka_windows_mingw\examples
 mkdir umka_windows_mingw\examples\3dcam
 mkdir umka_windows_mingw\examples\fractal
 mkdir umka_windows_mingw\examples\lisp
 mkdir umka_windows_mingw\examples\raytracer
 mkdir umka_windows_mingw\doc
+mkdir umka_windows_mingw\editors
 
 copy examples\3dcam\*.* umka_windows_mingw\examples\3dcam
 copy examples\fractal\*.* umka_windows_mingw\examples\fractal
 copy examples\lisp\*.* umka_windows_mingw\examples\lisp
 copy examples\raytracer\*.* umka_windows_mingw\examples\raytracer
 copy doc\*.* umka_windows_mingw\doc
+copy editors\*.* umka_windows_mingw\editors

build_windows_msvc.bat

@@ -14,17 +14,18 @@ move /y src\libumka* umka_windows_msvc
 move /y src\umka.exe umka_windows_msvc
 copy src\umka_api.h umka_windows_msvc
 copy LICENSE umka_windows_msvc
-copy Umka.sublime-syntax umka_windows_msvc
 
 mkdir umka_windows_msvc\examples
 mkdir umka_windows_msvc\examples\3dcam
 mkdir umka_windows_msvc\examples\fractal
 mkdir umka_windows_msvc\examples\lisp
 mkdir umka_windows_msvc\examples\raytracer
 mkdir umka_windows_msvc\doc
+mkdir umka_windows_msvc\editors
 
 copy examples\3dcam\*.* umka_windows_msvc\examples\3dcam
 copy examples\fractal\*.* umka_windows_msvc\examples\fractal
 copy examples\lisp\*.* umka_windows_msvc\examples\lisp
 copy examples\raytracer\*.* umka_windows_msvc\examples\raytracer
 copy doc\*.* umka_windows_msvc\doc
+copy editors\*.* umka_windows_msvc\editors

doc/lang.md

@@ -786,6 +786,12 @@ fn sizeofself(a: interface{...}): int
 
 Returns the size in bytes of the variable that has been converted to the interface `a`.
 
+```
+fn selfptr(a: interface{...}): ^void
+```
+
+Returns the pointer to the variable that has been converted to the interface `a`.
+
 ```
 fn selfhasptr(a: interface{...}): bool
 ```

Umka.sublime-syntax editors/Umka.sublime-syntaxUmka.sublime-syntax renamed to editors/Umka.sublime-syntax

@@ -6,7 +6,7 @@ file_extensions:
 scope: source.umka
 variables:
   keyword: (break|case|const|continue|default|else|enum|for|fn|import|interface|if|in|map|return|str|struct|switch|type|var|weak)
-  builtin: (abs|append|atan|atan2|cap|ceil|copy|cos|delete|exit|exp|fabs|floor|fprintf|fscanf|insert|keys|len|log|make|memusage|new|printf|resume|round|scanf|selfhasptr|selftypeeq|sin|sizeof|sizeofself|slice|sort|sprintf|sqrt|sscanf|trunc|typeptr|valid|validkey)
+  builtin: (abs|append|atan|atan2|cap|ceil|copy|cos|delete|exit|exp|fabs|floor|fprintf|fscanf|insert|keys|len|log|make|memusage|new|printf|resume|round|scanf|selfhasptr|selfptr|selftypeeq|sin|sizeof|sizeofself|slice|sort|sprintf|sqrt|sscanf|trunc|typeptr|valid|validkey)
   ident: '[A-Za-z_][A-Za-z_0-9]*'
   typeident: '_*[A-Z][A-Za-z_0-9]*'
   space: '\s*'

playground/umka.js

@@ -82,7 +82,7 @@ fn tobytes*(buf: any): []uint8 {
         return {}
     }
     bytes := make([]uint8, sizeofself(buf))
-    rtlmemcpy(&bytes[0], buf.__self, sizeofself(buf))
+    rtlmemcpy(&bytes[0], selfptr(buf), sizeofself(buf))
     return bytes
 }
 
@@ -93,7 +93,7 @@ fn frombytes*(buf: any, bytes: []uint8): Err {
     if selfhasptr(buf) {
         return stderror(.ptr)
     }
-    rtlmemcpy(buf.__self, &bytes[0], sizeofself(buf))
+    rtlmemcpy(selfptr(buf), &bytes[0], sizeofself(buf))
     return {}    
 }
 
@@ -203,7 +203,7 @@ fn freadwrite(f: File, buf: any, reading: bool): (int, Err) {
             if selfhasptr(buf) {
                 return 0, stderror(.ptr)
             }
-            length, data = sizeofself(buf), buf.__self
+            length, data = sizeofself(buf), selfptr(buf)
     }
     if length == 0 || data == null {
         return 0, stderror(.ok)

runtime/std.um

@@ -70,19 +70,19 @@ static void compilerDeclareBuiltinTypes(Compiler *comp)
     // any
     comp->anyType = typeAdd(&comp->types, &comp->blocks, TYPE_INTERFACE);
 
-    typeAddField(&comp->types, comp->anyType, comp->ptrVoidType, "__self");
-    typeAddField(&comp->types, comp->anyType, comp->ptrVoidType, "__selftype");
+    typeAddField(&comp->types, comp->anyType, comp->ptrVoidType, "#self");
+    typeAddField(&comp->types, comp->anyType, comp->ptrVoidType, "#selftype");
 
     // fiber
     comp->fiberType = typeAdd(&comp->types, &comp->blocks, TYPE_FIBER);
 
     Type *fnType = typeAdd(&comp->types, &comp->blocks, TYPE_FN);
-    typeAddParam(&comp->types, &fnType->sig, comp->anyType, "__upvalues");
+    typeAddParam(&comp->types, &fnType->sig, comp->anyType, "#upvalues");
     fnType->sig.resultType = comp->voidType;
 
     comp->fiberType->base = typeAdd(&comp->types, &comp->blocks, TYPE_CLOSURE);
-    typeAddField(&comp->types, comp->fiberType->base, fnType, "__fn");
-    typeAddField(&comp->types, comp->fiberType->base, comp->anyType, "__upvalues");
+    typeAddField(&comp->types, comp->fiberType->base, fnType, "#fn");
+    typeAddField(&comp->types, comp->fiberType->base, comp->anyType, "#upvalues");
 }
 
 
@@ -151,6 +151,7 @@ static void compilerDeclareBuiltinIdents(Compiler *comp)
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "cap",        comp->intType,     BUILTIN_CAP);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "sizeof",     comp->intType,     BUILTIN_SIZEOF);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "sizeofself", comp->intType,     BUILTIN_SIZEOFSELF);
+    identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "selfptr",    comp->ptrVoidType, BUILTIN_SELFPTR);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "selfhasptr", comp->boolType,    BUILTIN_SELFHASPTR);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "selftypeeq", comp->boolType,    BUILTIN_SELFTYPEEQ);
     identAddBuiltinFunc(&comp->idents, &comp->modules, &comp->blocks, "typeptr",    comp->ptrVoidType, BUILTIN_TYPEPTR);
@@ -229,7 +230,7 @@ void compilerInit(Compiler *comp, const char *fileName, const char *sourceString
     comp->argc  = argc;
     comp->argv  = argv;
 
-    comp->blocks.module = moduleAdd(&comp->modules, "__universe");
+    comp->blocks.module = moduleAdd(&comp->modules, "#universe");
 
     compilerDeclareBuiltinTypes (comp);
     compilerDeclareBuiltinIdents(comp);