Permalink
Browse files

Merge branch 'master' of git://github.com/stevedekorte/io into doc

  • Loading branch information...
2 parents dd8d57e + a34344e commit 2251687ae233acfbd97606f9afb61036b24e7fa5 @mig-hub mig-hub committed Jan 19, 2013
@@ -19,6 +19,9 @@ if(SQLITE_FOUND)
# Additional include directories
include_directories(${SQLITE_INCLUDE_DIRS})
+ # Additional link directories
+ link_directories(${SQLITE_LIBRARY_DIRS})
+
# Generate the IoSQLite3Init.c file.
# Argument SHOULD ALWAYS be the exact name of the addon, case is
# important.
@@ -18,8 +18,6 @@
#include "IoState.h"
#include "IoSeq.h"
-#include <uuid/uuid.h>
-
static const char *protoId = "UUID";
IoTag *IoUUID_newTag(void *state)
View
@@ -1617,7 +1617,7 @@
)
e catch(Exception,
- writeln(e coroutine backtraceString)
+ writeln(e coroutine backTraceString)
)
</pre>
@@ -1869,14 +1869,14 @@
Slicing:
<pre>
-"Kirikuro" slice(0, 2)
+"Kirikuro" exSlice(0, 2)
==> "Ki"
-"Kirikuro" slice(-2) # NOT: slice(-2, 0)!
+"Kirikuro" exSlice(-2) # NOT: exSlice(-2, 0)!
==> "ro"
-Io> "Kirikuro" slice(0, -2)
-# "Kiriku"
+Io> "Kirikuro" exSlice(0, -2)
+==> "Kiriku"
</pre>
Stripping whitespace:
View
@@ -171,7 +171,7 @@
Io> d foreach(i, v, writeln(i, ": ", v))
0: 5
1: 123
-3: 20
+2: 20
Io> list("abc", "def", "ghi") foreach(println)
abc
@@ -212,10 +212,10 @@
Io> s findSeq("test")
==> 10
-Io> s slice(10)
+Io> s exSlice(10)
==> "test"
-Io> s slice(2, 10)
+Io> s exSlice(2, 10)
==> "is is a "
</PRE>
@@ -236,4 +236,4 @@
<br>
<br>
<br>
-<br>
+<br>
@@ -403,7 +403,7 @@
<p>
<div class=slotDescription>
Also known as foldl or inject. Combines values in target starting on the left.
- If no initial value is paseed the head of the list is used. <br />
+ If no initial value is passed the head of the list is used. <br />
<pre>
Io> list(1, 2, 3) reduce(+)
==> 6
@@ -514,7 +514,7 @@
==> 5, 7</pre>
</div>
<a name="List-setSize"></a><b>
-setSize
+setSize(newSize)
</b>
<p>
<div class=slotDescription>
@@ -64,7 +64,7 @@
-->
- <default id="Base" color="#000" background-color="#fff" font-weight="normal" font-style="normal">
+ <default id="Base" color="#000" background-color="#fff" font-weight="normal" font-style="normal" scope="meta.default">
<!--
The <keywords> tag specifies keyword groups within the current state.
@@ -92,7 +92,7 @@
-->
- <keywords id="Keywords" color="#d90" useforautocomplete="no">
+ <keywords id="Keywords" color="#d90" useforautocomplete="no" scope="keyword.io">
<string>self</string>
<string>sender</string>
<string>and</string>
@@ -118,15 +118,15 @@
<string>while</string>
</keywords>
- <keywords id="Numbers" color="#009919" useforautocomplete="no">
+ <keywords id="Numbers" color="#009919" useforautocomplete="no" scope="constant.numeric.keyword.io">
<regex>(?&lt;=[^[A-Za-z0-9]]|^)((([0-9]+\.[0-9]*)|(\.[0-9]+)([eE][+\-]?[0-9]+)?[fFlL]?)|((([1-9][0-9]*)|0[0-7]*|(0[xX][0-9a-fA-F]))(([uU][lL]?)|([lL][uU]?))?))(?=[^[A-Za-z0-9]]|$)</regex>
</keywords>
- <keywords id="Operators" color="#407" useforautocomplete="no">
+ <keywords id="Operators" color="#407" useforautocomplete="no" scope="language.operator.io">
<regex>([\+\-\*\\\=\{\}\[\]\|\!\:\&lt;\&gt;])</regex>
</keywords>
- <keywords id="Brackets" color="#f00" useforautocomplete="no">
+ <keywords id="Brackets" color="#f00" useforautocomplete="no" scope="language.operator.io">
<regex>([\(\)])</regex>
</keywords>
</default>
@@ -138,22 +138,22 @@
contain a <regex> tag. They can contain <keywords> tags like specified above.
-->
- <state id="HashComment" color="#b00" background-color="none" font-weight="bold" font-style="italic">
+ <state id="HashComment" color="#b00" background-color="none" font-weight="bold" font-style="italic" scope="comment.line.hash.io">
<begin><regex>#</regex></begin>
<end><regex>[\n\r]</regex></end>
</state>
- <state id="Comment" color="#b00" background-color="none" font-weight="normal" font-style="italic">
+ <state id="Comment" color="#b00" background-color="none" font-weight="normal" font-style="italic" scope="comment.block.io">
<begin><regex>/\*</regex></begin>
<end><regex>\*/</regex></end>
</state>
- <state id="SingleComment" color="#b00" background-color="none" font-weight="normal" font-style="italic">
+ <state id="SingleComment" color="#b00" background-color="none" font-weight="normal" font-style="italic" scope="comment.line.double-slash.io">
<begin><regex>//</regex></begin>
<end><regex>[\n\r]</regex></end>
</state>
- <state id="String" color="#060" background-color="none" font-weight="normal" font-style="normal">
+ <state id="String" color="#060" background-color="none" font-weight="normal" font-style="normal" scope="string.double.io">
<begin><regex>"|"""</regex></begin>
<end><regex>(((?&lt;!\\)(\\\\)*)|^)"</regex></end>
</state>
@@ -599,7 +599,7 @@ void Coro_setup(Coro *self, void *arg)
if (64 > (- sav[i] + (uintptr_t)&i))
break;
assert(i < sz);
- sav[i] = stackend - sizeof(uintptr_t) - 128;
+ sav[i] = stackend - sizeof(uintptr_t)*2 - 128;
}
}
@@ -100,11 +100,15 @@ makecontext(ucontext_t *uc, void (*fn)(void), int argc, ...)
sp = (int*)uc->uc_stack.ss_sp+uc->uc_stack.ss_size/4;
va_start(arg, argc);
- for(i=0; i<4 && i<argc; i++)
- uc->uc_mcontext.gregs[i] = va_arg(arg, uint);
+
+ if(argc-- > 0) uc->uc_mcontext.arm_r0 = va_arg(arg, uint);
+ if(argc-- > 0) uc->uc_mcontext.arm_r1 = va_arg(arg, uint);
+ if(argc-- > 0) uc->uc_mcontext.arm_r2 = va_arg(arg, uint);
+ if(argc-- > 0) uc->uc_mcontext.arm_r3 = va_arg(arg, uint);
+
va_end(arg);
- uc->uc_mcontext.gregs[13] = (uint)sp;
- uc->uc_mcontext.gregs[14] = (uint)fn;
+ uc->uc_mcontext.arm_sp = (uint)sp;
+ uc->uc_mcontext.arm_lr = (uint)fn;
}
#endif
@@ -143,8 +143,8 @@ extern pid_t rfork_thread(int, void*, int(*)(void*), void*);
#if defined(__arm__)
int getmcontext(mcontext_t*);
void setmcontext(const mcontext_t*);
-#define setcontext(u) setmcontext(&(u)->uc_mcontext)
-#define getcontext(u) getmcontext(&(u)->uc_mcontext)
+#define setcontext(u) setmcontext((void *)&((u)->uc_mcontext.arm_r0))
+#define getcontext(u) getmcontext((void *)&((u)->uc_mcontext.arm_r0))
#endif
/*
@@ -72,7 +72,7 @@ Directory.io
list reverseInPlace
)
- //doc Directory accessibleAncestors Returns a list of accessizble ancestor directories.
+ //doc Directory accessibleAncestors Returns a list of accessible ancestor directories.
accessibleAncestors := method(ancestorDirectories select(isAccessible))
//doc Directory parents Deprecated. Replaced by ancestorDirectories.

0 comments on commit 2251687

Please sign in to comment.