about summary refs log tree commit diff stats
path: root/Makefile
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@wmii.de>2006-07-13 11:43:05 +0200
committerAnselm R. Garbe <garbeam@wmii.de>2006-07-13 11:43:05 +0200
commit9e8b3258a06de01c53e60243ffe3419b47d016dd (patch)
treea39ebed6cc97e75dc71f7ffb54ebb66342fef48d /Makefile
parent44f2e8b952264311887c3b51dc6a987af226062a (diff)
downloaddwm-9e8b3258a06de01c53e60243ffe3419b47d016dd.tar.gz
changed default colors
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 41bc879..d8f9ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = client.c dev.c draw.c event.c util.c wm.c
+SRC = client.c dev.c draw.c event.c main.c util.c
 OBJ = ${SRC:.c=.o}
 MAN1 = dwm.1 
 BIN = dwm
@@ -22,7 +22,7 @@ config:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: wm.h
+${OBJ}: dwm.h
 
 dwm: ${OBJ}
 	@echo LD $@
ious revision' href='/akkartik/mu/blame/cpp/literate/011load?h=main&id=5574fbaf794df7557fb6049e3721c4291556f3c1'>^
35457609 ^
acc4792d ^

36594a43 ^

363be37f ^
36594a43 ^
e26495c5 ^
8c9e97ae ^
cc3b58b6 ^

363be37f ^
a5840f21 ^
363be37f ^
08cf048f ^
a316f1e4 ^
08cf048f ^
fe263c52 ^
66abe7c1 ^



fe263c52 ^
1ead3562 ^
1625e908 ^

14274372 ^
1ead3562 ^
a0b9fa55 ^
1625e908 ^

a0b9fa55 ^
ad8e984f ^
fe263c52 ^
ad8e984f ^
1b76245c ^
ad8e984f ^
fe263c52 ^
781f2462 ^

36594a43 ^
1625e908 ^
b24eb476 ^
df40cb6e ^

66abe7c1 ^




712b442f ^
3c93ddcb ^
50e0065e ^
df40cb6e ^
1b76245c ^
df40cb6e ^
c4e143d6 ^
795f5244 ^
795f5244 ^
b2ec0969 ^
a0b9fa55 ^
1b76245c ^
795f5244 ^
14274372 ^
70f70118 ^
50e0065e ^
8f0a9149 ^
795f5244 ^
14274372 ^

70f70118 ^
f5dfb7f7 ^
3c93ddcb ^
66b97b4d ^
9dcbec39 ^
3c93ddcb ^
36594a43 ^

8d72e565 ^
70f70118 ^
9f95c745 ^
8d72e565 ^
36594a43 ^




0a2026a6 ^
08cf048f ^
66abe7c1 ^
0a2026a6 ^

36594a43 ^

08cf048f ^
1f7e3c05 ^
08cf048f ^
66abe7c1 ^
0a2026a6 ^

0a2026a6 ^
66abe7c1 ^




36594a43 ^
1f7e3c05 ^
36594a43 ^
0a2026a6 ^
c4e143d6 ^
781f2462 ^
781f2462 ^
d3c120c1 ^
36594a43 ^
05d17773 ^
b2ec0969 ^
08cf048f ^
66abe7c1 ^
0a2026a6 ^


36594a43 ^



6c96a437 ^
36594a43 ^
36594a43 ^


35064671 ^
1b76245c ^
35064671 ^

95f2fe96 ^
49620728 ^
36594a43 ^
6c96a437 ^
36594a43 ^
36594a43 ^
b2ec0969 ^
5683823a ^
6c96a437 ^
9f95c745 ^
6c96a437 ^
9f95c745 ^
08cf048f ^
1b76245c ^
0a2026a6 ^

95f2fe96 ^
0a2026a6 ^
36594a43 ^

7d07cd1d ^
36594a43 ^
3c93ddcb ^
8619c618 ^

36594a43 ^
1f7e3c05 ^
d7314554 ^





d3c120c1 ^
07c594eb ^
4b424bb2 ^
d3c120c1 ^

d7314554 ^


36594a43 ^

5f05e954 ^
536a22c1 ^
5f05e954 ^
536a22c1 ^
36594a43 ^

08cf048f ^
36594a43 ^




536a22c1 ^
36594a43 ^






a316f1e4 ^

08cf048f ^
a316f1e4 ^
1f7e3c05 ^
a316f1e4 ^

7232de70 ^
36594a43 ^

3c93ddcb ^











100157d1 ^
08cf048f ^
100157d1 ^
08cf048f ^
100157d1 ^


d63cddea ^







100157d1 ^
518e6c5e ^
1ead3562 ^

518e6c5e ^
1ead3562 ^
bc643692 ^
100157d1 ^
35457609 ^
acc4792d ^

100157d1 ^

1ead3562 ^
100157d1 ^
bc643692 ^
100157d1 ^
35457609 ^
acc4792d ^

100157d1 ^
051c4738 ^
1ead3562 ^
100157d1 ^
bc643692 ^
100157d1 ^

35457609 ^
acc4792d ^

100157d1 ^
051c4738 ^
1ead3562 ^
bc643692 ^
100157d1 ^
bc643692 ^
100157d1 ^
35457609 ^
acc4792d ^

35457609 ^
acc4792d ^

100157d1 ^

1ead3562 ^
bc643692 ^
100157d1 ^
35457609 ^
acc4792d ^

100157d1 ^
96ac511e ^
1ead3562 ^
3a787ca7 ^
96ac511e ^
3a787ca7 ^
96ac511e ^
72c4fb2d ^
1ead3562 ^
72c4fb2d ^



a4ef18b1 ^
1ead3562 ^
bc643692 ^
a4ef18b1 ^
35457609 ^
acc4792d ^

a4ef18b1 ^
96ac511e ^
1ead3562 ^
bc643692 ^
96ac511e ^
35457609 ^
acc4792d ^


96ac511e ^

1ead3562 ^
bc643692 ^
96ac511e ^
35457609 ^
acc4792d ^



f02842a9 ^

1ead3562 ^
bc643692 ^
f02842a9 ^
35457609 ^
acc4792d ^



0060093e ^

1ead3562 ^
8a3d101e ^
0060093e ^
acc4792d ^
076f39b8 ^



076f39b8 ^





14274372 ^
faf521d9 ^






ee6a21ce ^




ec99eb7a ^
ee6a21ce ^






a0b9fa55 ^
5ed9bb13 ^
1ead3562 ^
14274372 ^

1ead3562 ^
14274372 ^

5ed9bb13 ^
14274372 ^
a0b9fa55 ^
1ead3562 ^
14274372 ^

1ead3562 ^
14274372 ^

5ed9bb13 ^

ee6a21ce ^










1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
                                                                      
   
                                   
                              
 
                                                                                
                        
          
                     
 
                         

                                     

       
                                          
                         
                      
                  

 
                                          
                      
                                
                        
                                     
                             
                                   



                            
                       
                                                  

                                          
     
                                                         
                                     

                                          
                                      
     
                           
          
                                                                         
     
   

                
 
                                                        
                               

                              




                                                   
                         
                                      
                           
                          
                                            
                                                                  
                                                 
                                                            
                                                                      
                                                      
                                               
                                                                    
                                                   
   
                         
                            
                                                        
                                          

 
                                              
                      
                                      
                      
                                                                           
                                                                         

                                       
                                                    
                                                   
                                                                           
                                                       




                                                       
                                   
                      
                                                               

                 

                       
                                             
                                        
                        
                                                                 

                   
                                




                                                                 
                          
                                        
   
                                   
                                             
                                   
 
                                                       
                          
                              
                                                              
                        
                                                                 


                   



                                                              
                             
                                            


                    
                         
                                                                  

                 
                        
                                                  
 
                                 
                                             
 
                                                                 
                                                                                          
                                                                                                    
                                                                       
                                                                                              
                                                                    
                      
                                                       

                 
                               
              

 
                                                           
                               
                                      

                                
                      
                                                   





                                                                          
                                        
                                                            
                                                                                         

 


                                               

 
                       
                  
                                        
       

                                            
                                                                    




                   
                                                                                              






                    

                                                
                             
                                     
                                                              

                                                
   

 











                                                                               
                                
                                         
             
                                                       


   







                                     
                                        
                                                                                     

        
                                        
          
                     
 
                         

                                     

                                             
          
           
                     
 
                         

                                     
 
                                               
          
           
                     

           
                         

                                     
 
                                               
          
                     
           
                     
 
                         

                                     
                         

                                     

                                           
          
                                
 
                         

                                     
 
                       
          
      
 
                   
 
                                       
          



                         
                                     
          
                                 
 
                         

                                                           
 
                                   
          
                               
 
                         


                                     

                                      
          
                                         
 
                         



                                     

                                
          
                                                 
 
                         



                                            

                            
          
                                    
 
                                                          



                                                





                                             
 






                                                




                                                                             
                     






                                                           
                                     
                     
          

                     
          

                     
                              
 
                                              
          

                     
           

                     

                              










                                       
//: Phase 1 of running Mu code: load it from a textual representation.
//:
//: The process of running Mu code:
//:   load -> transform -> run

:(scenarios load)  // use 'load' instead of 'run' in all scenarios in this layer
:(scenario first_recipe)
def main [
  1:number <- copy 23
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}

:(code)
vector<recipe_ordinal> load(string form) {
  istringstream in(form);
  in >> std::noskipws;
  return load(in);
}

vector<recipe_ordinal> load(istream& in) {
  in >> std::noskipws;
  vector<recipe_ordinal> result;
  while (has_data(in)) {
    skip_whitespace_and_comments(in);
    if (!has_data(in)) break;
    string command = next_word(in);
    if (command.empty()) {
      assert(!has_data(in));
      break;
    }
    // Command Handlers
    if (command == "recipe" || command == "def") {
      recipe_ordinal r = slurp_recipe(in);
      if (r > 0) result.push_back(r);
    }
    else if (command == "recipe!" || command == "def!") {
      Disable_redefine_checks = true;
      recipe_ordinal r = slurp_recipe(in);
      if (r > 0) result.push_back(r);
      Disable_redefine_checks = false;
    }
    // End Command Handlers
    else {
      raise << "unknown top-level command: " << command << '\n' << end();
    }
  }
  return result;
}

// return the recipe ordinal slurped, or -1 if it failed
int slurp_recipe(istream& in) {
  recipe result;
  result.name = next_word(in);
  if (result.name.empty()) {
    assert(!has_data(in));
    raise << "file ended with 'recipe'\n" << end();
    return -1;
  }
  // End Load Recipe Name
  skip_whitespace_but_not_newline(in);
  // End Recipe Refinements
  if (result.name.empty())
    raise << "empty result.name\n" << end();
  trace(9991, "parse") << "--- defining " << result.name << end();
  if (!contains_key(Recipe_ordinal, result.name))
    put(Recipe_ordinal, result.name, Next_recipe_ordinal++);
  if (Recipe.find(get(Recipe_ordinal, result.name)) != Recipe.end()) {
    trace(9991, "parse") << "already exists" << end();
    if (should_check_for_redefine(result.name))
      raise << "redefining recipe " << result.name << "\n" << end();
    Recipe.erase(get(Recipe_ordinal, result.name));
  }
  slurp_body(in, result);
  // End Recipe Body(result)
  put(Recipe, get(Recipe_ordinal, result.name), result);
  return get(Recipe_ordinal, result.name);
}

void slurp_body(istream& in, recipe& result) {
  in >> std::noskipws;
  skip_whitespace_but_not_newline(in);
  if (in.get() != '[')
    raise << result.name << ": recipe body must begin with '['\n" << end();
  skip_whitespace_and_comments(in);  // permit trailing comment after '['
  instruction curr;
  while (next_instruction(in, &curr)) {
    curr.original_string = to_original_string(curr);
    // End Rewrite Instruction(curr, recipe result)
    trace(9992, "load") << "after rewriting: " << to_string(curr) << end();
    if (!curr.is_empty()) result.steps.push_back(curr);
  }
}

bool next_instruction(istream& in, instruction* curr) {
  curr->clear();
  skip_whitespace_and_comments(in);
  if (!has_data(in)) {
    raise << "incomplete recipe at end of file (0)\n" << end();
    return false;
  }

  vector<string> words;
  while (has_data(in) && in.peek() != '\n') {
    skip_whitespace_but_not_newline(in);
    if (!has_data(in)) {
      raise << "incomplete recipe at end of file (1)\n" << end();
      return false;
    }
    string word = next_word(in);
    if (word.empty()) {
      assert(!has_data(in));
      raise << "incomplete recipe at end of file (2)\n" << end();
      return false;
    }
    words.push_back(word);
    skip_whitespace_but_not_newline(in);
  }
  skip_whitespace_and_comments(in);
  if (SIZE(words) == 1 && words.at(0) == "]")
    return false;  // end of recipe

  if (SIZE(words) == 1 && is_label_word(words.at(0))) {
    curr->is_label = true;
    curr->label = words.at(0);
    trace(9993, "parse") << "label: " << curr->label << end();
    if (!has_data(in)) {
      raise << "incomplete recipe at end of file (3)\n" << end();
      return false;
    }
    return true;
  }

  vector<string>::iterator p = words.begin();
  if (find(words.begin(), words.end(), "<-") != words.end()) {
    for (;  *p != "<-";  ++p)
      curr->products.push_back(reagent(*p));
    ++p;  // skip <-
  }

  if (p == words.end()) {
    raise << "instruction prematurely ended with '<-'\n" << end();
    return false;
  }
  curr->name = *p;  ++p;
  // curr->operation will be set at transform time

  for (;  p != words.end();  ++p)
    curr->ingredients.push_back(reagent(*p));

  trace(9993, "parse") << "instruction: " << curr->name << end();
  trace(9993, "parse") << "  number of ingredients: " << SIZE(curr->ingredients) << end();
  for (vector<reagent>::iterator p = curr->ingredients.begin();  p != curr->ingredients.end();  ++p)
    trace(9993, "parse") << "  ingredient: " << to_string(*p) << end();
  for (vector<reagent>::iterator p = curr->products.begin();  p != curr->products.end();  ++p)
    trace(9993, "parse") << "  product: " << to_string(*p) << end();
  if (!has_data(in)) {
    raise << "9: unbalanced '[' for recipe\n" << end();
    return false;
  }
  // End next_instruction(curr)
  return true;
}

// can return empty string -- only if 'in' has no more data
string next_word(istream& in) {
  skip_whitespace_but_not_newline(in);
  // End next_word Special-cases
  ostringstream out;
  slurp_word(in, out);
  skip_whitespace_and_comments_but_not_newline(in);
  string result = out.str();
  if (result != "[" && ends_with(result, '['))
    raise << "insert a space before '[' in '" << result << "'\n" << end();
  return result;
}

bool is_label_word(const string& word) {
  if (word.empty()) return false;  // error raised elsewhere
  return !isalnum(word.at(0)) && string("$_*@&,=-[]()").find(word.at(0)) == string::npos;
}

bool ends_with(const string& s, const char c) {
  if (s.empty()) return false;
  return *s.rbegin() == c;
}

:(before "End Globals")
// word boundaries
extern const string Terminators("(){}");
:(code)
void slurp_word(istream& in, ostream& out) {
  char c;
  if (has_data(in) && Terminators.find(in.peek()) != string::npos) {
    in >> c;
    out << c;
    return;
  }
  while (in >> c) {
    if (isspace(c) || Terminators.find(c) != string::npos || Ignore.find(c) != string::npos) {
      in.putback(c);
      break;
    }
    out << c;
  }
}

void skip_whitespace_and_comments(istream& in) {
  while (true) {
    if (!has_data(in)) break;
    if (isspace(in.peek())) in.get();
    else if (Ignore.find(in.peek()) != string::npos) in.get();
    else if (in.peek() == '#') skip_comment(in);
    else break;
  }
}

// confusing; move to the next line only to skip a comment, but never otherwise
void skip_whitespace_and_comments_but_not_newline(istream& in) {
  while (true) {
    if (!has_data(in)) break;
    if (in.peek() == '\n') break;
    if (isspace(in.peek())) in.get();
    else if (Ignore.find(in.peek()) != string::npos) in.get();
    else if (in.peek() == '#') skip_comment(in);
    else break;
  }
}

void skip_comment(istream& in) {
  if (has_data(in) && in.peek() == '#') {
    in.get();
    while (has_data(in) && in.peek() != '\n') in.get();
  }
}

:(scenario recipe_instead_of_def)
recipe main [
  1:number <- copy 23
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}

:(scenario parse_comment_outside_recipe)
# this comment will be dropped by the tangler, so we need a dummy recipe to stop that
def f1 [
]
# this comment will go through to 'load'
def main [
  1:number <- copy 23
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}

:(scenario parse_comment_amongst_instruction)
def main [
  # comment
  1:number <- copy 23
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}

:(scenario parse_comment_amongst_instruction_2)
def main [
  # comment
  1:number <- copy 23
  # comment
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}

:(scenario parse_comment_amongst_instruction_3)
def main [
  1:number <- copy 23
  # comment
  2:number <- copy 23
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {2: "number"}

:(scenario parse_comment_after_instruction)
def main [
  1:number <- copy 23  # comment
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}

:(scenario parse_label)
def main [
  +foo
]
+parse: label: +foo

:(scenario parse_dollar_as_recipe_name)
def main [
  $foo
]
+parse: instruction: $foo

:(scenario parse_multiple_properties)
def main [
  1:number <- copy 23/foo:bar:baz
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal", "foo": ("bar" "baz")}
+parse:   product: {1: "number"}

:(scenario parse_multiple_products)
def main [
  1:number, 2:number <- copy 23
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   product: {1: "number"}
+parse:   product: {2: "number"}

:(scenario parse_multiple_ingredients)
def main [
  1:number, 2:number <- copy 23, 4:number
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   ingredient: {4: "number"}
+parse:   product: {1: "number"}
+parse:   product: {2: "number"}

:(scenario parse_multiple_types)
def main [
  1:number, 2:address:number <- copy 23, 4:number
]
+parse: instruction: copy
+parse:   ingredient: {23: "literal"}
+parse:   ingredient: {4: "number"}
+parse:   product: {1: "number"}
+parse:   product: {2: ("address" "number")}

:(scenario parse_properties)
def main [
  1:address:number/lookup <- copy 23
]
+parse:   product: {1: ("address" "number"), "lookup": ()}

//: this test we can't represent with a scenario
:(code)
void test_parse_comment_terminated_by_eof() {
  load("recipe main [\n"
       "  a:number <- copy 34\n"
       "]\n"
       "# abc");  // no newline after comment
  cerr << ".";  // termination = success
}

:(scenario warn_on_missing_space_before_bracket)
% Hide_errors = true;
def main[
  1:number <- copy 23
]
+error: insert a space before '[' in 'main['

//: Warn if a recipe gets redefined, because large codebases can accidentally
//: step on their own toes. But there'll be many occasions later where
//: we'll want to disable the errors.
:(before "End Globals")
bool Disable_redefine_checks = false;
:(before "End Reset")
Disable_redefine_checks = false;
:(code)
bool should_check_for_redefine(const string& recipe_name) {
  if (Disable_redefine_checks) return false;
  return true;
}

:(scenario forbid_redefining_recipes)
% Hide_errors = true;
def main [
  1:number <- copy 23
]
def main [
  1:number <- copy 24
]
+error: redefining recipe main

:(scenario permit_forcibly_redefining_recipes)
def main [
  1:number <- copy 23
]
def! main [
  1:number <- copy 24
]
-error: redefining recipe main
$error: 0

:(code)
// for debugging
void show_rest_of_stream(istream& in) {
  cerr << '^';
  char c;
  while (in >> c)
    cerr << c;
  cerr << "$\n";
  exit(0);
}