about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-08-20 22:03:31 -0700
committerKartik K. Agaram <vc@akkartik.com>2017-08-20 22:03:31 -0700
commit7a4bf4cfabd5808f986003154585cde7eca248f9 (patch)
treeef1c15024a8583d5d43638237b39f2e2d77df0f1
parentaa42c8646ac87ec4c0a41b09b6153a73d12688ed (diff)
downloadmu-7a4bf4cfabd5808f986003154585cde7eca248f9.tar.gz
3976
-rw-r--r--global.mu14
-rw-r--r--html/global.mu.html75
-rw-r--r--mu.vim2
-rw-r--r--vimrc.vim1
4 files changed, 1 insertions, 91 deletions
diff --git a/global.mu b/global.mu
deleted file mode 100644
index 7e0c042f..00000000
--- a/global.mu
+++ /dev/null
@@ -1,14 +0,0 @@
-# example program: creating and using global variables
-
-def main [
-  # allocate 5 locations for globals
-  global-space:space <- new location:type, 5
-  # read to globals by using /space:global
-  1:num/space:global <- copy 3
-  foo
-]
-
-def foo [
-  # ditto for writing to globals
-  $print 1:num/space:global, 10/newline
-]
diff --git a/html/global.mu.html b/html/global.mu.html
deleted file mode 100644
index f2c662b7..00000000
--- a/html/global.mu.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - global.mu</title>
-<meta name="Generator" content="Vim/7.4">
-<meta name="plugin-version" content="vim7.4_v2">
-<meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
-<style type="text/css">
-<!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-a { color:#eeeeee; text-decoration: none; }
-a:hover { text-decoration: underline; }
-* { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
--->
-</style>
-
-<script type='text/javascript'>
-<!--
-
-/* function to open any folds containing a jumped-to line before jumping to it */
-function JumpToLine()
-{
-  var lineNum;
-  lineNum = window.location.hash;
-  lineNum = lineNum.substr(1); /* strip off '#' */
-
-  if (lineNum.indexOf('L') == -1) {
-    lineNum = 'L'+lineNum;
-  }
-  lineElem = document.getElementById(lineNum);
-  /* Always jump to new location even if the line was hidden inside a fold, or
-   * we corrected the raw number to a line ID.
-   */
-  if (lineElem) {
-    lineElem.scrollIntoView(true);
-  }
-  return true;
-}
-if ('onhashchange' in window) {
-  window.onhashchange = JumpToLine;
-}
-
--->
-</script>
-</head>
-<body onload='JumpToLine();'>
-<pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="Comment"># example program: creating and using global variables</span>
-<span id="L2" class="LineNr"> 2 </span>
-<span id="L3" class="LineNr"> 3 </span><span class="muRecipe">def</span> <a href='global.mu.html#L3'>main</a> [
-<span id="L4" class="LineNr"> 4 </span>  <span class="Comment"># allocate 5 locations for globals</span>
-<span id="L5" class="LineNr"> 5 </span>  <span class="Constant">global-space</span>:space <span class="Special">&lt;-</span> new <span class="Constant">location:type</span>,<span class="Constant"> 5</span>
-<span id="L6" class="LineNr"> 6 </span>  <span class="Comment"># read to globals by using /space:global</span>
-<span id="L7" class="LineNr"> 7 </span>  <span class="Special">1:num/space:global</span> <span class="Special">&lt;-</span> copy<span class="Constant"> 3</span>
-<span id="L8" class="LineNr"> 8 </span>  <a href='global.mu.html#L11'>foo</a>
-<span id="L9" class="LineNr"> 9 </span>]
-<span id="L10" class="LineNr">10 </span>
-<span id="L11" class="LineNr">11 </span><span class="muRecipe">def</span> <a href='global.mu.html#L11'>foo</a> [
-<span id="L12" class="LineNr">12 </span>  <span class="Comment"># ditto for writing to globals</span>
-<span id="L13" class="LineNr">13 </span>  $print <span class="Special">1:num/space:global</span>, <span class="Constant">10/newline</span>
-<span id="L14" class="LineNr">14 </span>]
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/mu.vim b/mu.vim
index 571df684..83a1f683 100644
--- a/mu.vim
+++ b/mu.vim
@@ -53,7 +53,7 @@ syntax match muLiteral %[^ ]\+:type/[^ ,]*\|[^ ]\+:type\>%
 syntax match muLiteral %[^ ]\+:offset/[^ ,]*\|[^ ]\+:offset\>%
 syntax match muLiteral %[^ ]\+:variant/[^ ,]*\|[^ ]\+:variant\>%
 highlight link muLiteral Constant
-syntax keyword muKeyword default-space global-space new-default-space local-scope next-ingredient ingredient rewind-ingredients load-ingredients | highlight link muKeyword Constant
+syntax keyword muKeyword default-space new-default-space local-scope next-ingredient ingredient rewind-ingredients load-ingredients | highlight link muKeyword Constant
 
 syntax match muDelimiter "[{}]" | highlight link muDelimiter Delimiter
 syntax match muAssign "<-"
diff --git a/vimrc.vim b/vimrc.vim
index 5587637e..972754f9 100644
--- a/vimrc.vim
+++ b/vimrc.vim
@@ -33,7 +33,6 @@ function! HighlightTangledFile()
   syntax match muLiteral %[^ ]\+:variant/[^ ,]*\|[^ ]\+:variant\>%
   highlight link muLiteral Constant
   syntax match muAssign " <- \|\<raw\>" | highlight link muAssign SpecialChar
-  syntax match muGlobal %[^ ]\+:global/[^ ,]*\|[^ ]\+:global\>% | highlight link muGlobal SpecialChar
   " common keywords
   syntax match muRecipe "^recipe\>\|^recipe!\>\|^def\>\|^def!\>\|^before\>\|^after\>\| -> " | highlight muRecipe ctermfg=208
   syntax match muScenario "^scenario\>" | highlight muScenario ctermfg=34