about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-07-29 20:46:34 -0700
committerKartik K. Agaram <vc@akkartik.com>2015-07-29 20:46:34 -0700
commit8d4c2a095f94fe88d793f575825ba576676fc1a1 (patch)
tree01112291707c60f25a408a1aee67caae9ece5493
parent08f013ffee9dbc63673c5712be1672b38bb5791a (diff)
downloadmu-8d4c2a095f94fe88d793f575825ba576676fc1a1.tar.gz
1893
Diffstat
-rw-r--r--Readme.md12


1 files changed, 6 insertions, 6 deletions
diff --git a/Readme.md b/Readme.md
index 11087bb9..290756d1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -256,17 +256,17 @@ inserting code at them.
 
   after +base-case [
     # if n=0 return 1
-    zero?:boolean <- equal n:number, 0
-    break-unless zero?:boolean
+    zero?:boolean <- equal n, 0
+    break-unless zero?
     reply 1
   ]
 
   after +recursive-case [
     # return n * factorial(n-1)
-    x:number <- subtract n:number, 1
-    subresult:number <- factorial x:number
-    result:number <- multiply subresult:number, n:number
-    reply result:number
+    x:number <- subtract n, 1
+    subresult:number <- factorial x
+    result:number <- multiply subresult, n
+    reply result
   ]
 ```
 

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-02 17:54:54 +0000


 


fac4056b788b2db3a2ee'>^

582f3519 ^

3a1e1f28 ^

f473be92 ^

3a1e1f28 ^


2c5ea01d ^

5fca2a0b ^

b0a216f5 ^

2c5ea01d ^

b0a216f5 ^




3a1e1f28 ^

b0a216f5 ^

e7758eba ^

b0a216f5 ^


ececd03e ^















2c5ea01d ^

582f3519 ^

b06433bc ^

582f3519 ^


94c5d83e ^

dee6cfa6 ^

e9e4b4ff ^

b0a216f5 ^

76612b05 ^

ececd03e ^

b0a216f5 ^

e9e4b4ff ^






612b8b8b ^

e9e4b4ff ^

52403c53 ^

ad51cca4 ^

08e43b29 ^



ad51cca4 ^







b3d031a9 ^

c5f776ed ^

b3d031a9 ^


bc2c5619 ^

c5f776ed ^


b3d031a9 ^


c5f776ed ^


c216901a ^

f473be92 ^

5fca2a0b ^

9cf43c17 ^

5fca2a0b ^

c5f776ed ^


a052151f ^

c5f776ed ^



185c022e ^

5fca2a0b ^

c7720fff ^



a6836d5d ^


c7720fff ^

8d21b83c ^



e9e4b4ff ^

ececd03e ^

e9e4b4ff ^

0c2c782d ^

636d9393 ^

b0a216f5 ^

c6afc196 ^


c0d63e78 ^



ececd03e ^




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




                                                                 
 
             
                                                            

                          
                                                                                   

                                                                            

                                                                                  
                                       
                   
            
               
           

                  
 
                     
                                                            
 



                                  
                                          
                                  
                                    

     














                                                                                   
 
        
                                                 

                                                            
              
                                                                      
 
      
                                                 
                                                                         
 





                                                  
                                                                         
 
                   
                                                               


                                           






                                                                   
 
            

                                 
                                                                         

            

                                                     

             
                                   
                                                                                                
                                           
                                                                                
            

            
                                        


                                                      
                                                   
 


                                                                               

                                                                                          
 


                                                           
         
                                                           
 
         
                                                                                              
 

              


                                                      

                                                                                              
# This file is part of ranger, the console file manager.
# License: GNU GPL version 3, see the file "AUTHORS" for details.

NAME = ranger
VERSION = $(shell grep -m 1 -o '[0-9][0-9.]\+\S*' README.md)
NAME_RIFLE = rifle
VERSION_RIFLE = $(VERSION)
SNAPSHOT_NAME ?= $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz
# Find suitable python version (need python >= 2.6 or 3.1):
PYTHON ?= $(shell python -c 'import sys; sys.exit(sys.version < "2.6")' && \
	which python || which python3.3 || which python3.2 || which python3.1 || \
	which python3 || which python2.7 || which python2.6)
SETUPOPTS ?= '--record=install_log.txt'
DOCDIR ?= doc/pydoc
DESTDIR ?= /
PYOPTIMIZE ?= 1
FILTER ?= .

CWD = $(shell pwd)

default: test compile
	@echo 'Run `make options` for a list of all options'

options: help
	@echo
	@echo 'Options:'
	@echo 'PYTHON = $(PYTHON)'
	@echo 'PYOPTIMIZE = $(PYOPTIMIZE)'
	@echo 'DOCDIR = $(DOCDIR)'
	@echo 'DESTDIR = $(DESTDIR)'

help:
	@echo 'make:              Test and compile ranger.'
	@echo 'make install:      Install $(NAME)'
	@echo 'make pypi_sdist:   Release a new sdist to PyPI'
	@echo 'make clean:        Remove the compiled files (*.pyc, *.pyo)'
	@echo 'make doc:          Create the pydoc documentation'
	@echo 'make cleandoc:     Remove the pydoc documentation'
	@echo 'make man:          Compile the manpage with "pod2man"'
	@echo 'make manhtml:      Compile the html manpage with "pod2html"'
	@echo 'make snapshot:     Create a tar.gz of the current git revision'
	@echo 'make test:         Test everything'
	@echo 'make test_pylint:  Test using pylint'
	@echo 'make test_flake8:  Test using flake8'
	@echo 'make test_doctest: Test using doctest'
	@echo 'make test_pytest:  Test using pytest'
	@echo 'make todo:         Look for TODO and XXX markers in the source code'

install:
	$(PYTHON) setup.py install $(SETUPOPTS) \
		'--root=$(DESTDIR)' --optimize=$(PYOPTIMIZE)

compile: clean
	PYTHONOPTIMIZE=$(PYOPTIMIZE) $(PYTHON) -m compileall -q ranger

clean:
	find ranger -regex .\*\.py[co]\$$ -delete
	find ranger -depth -name __pycache__ -type d -exec rm -r -- {} \;

doc: cleandoc
	mkdir -p $(DOCDIR)
	cd $(DOCDIR); \
		$(PYTHON) -c 'import pydoc, sys; \
		sys.path[0] = "$(CWD)"; \
		pydoc.writedocs("$(CWD)")'
	find . -name \*.html -exec sed -i 's|'"$(CWD)"'|../..|g' -- {} \;

TEST_PATHS_MAIN = \
	$(shell find ./ranger -mindepth 1 -maxdepth 1 -type d \
		! -name '__pycache__' \
		! -path './ranger/config' \
		! -path './ranger/data' \
	) \
	./ranger/__init__.py \
	$(shell find ./doc/tools ./examples -type f -name '*.py') \
	./ranger.py \
	./setup.py \
	./tests
TEST_PATH_CONFIG = ./ranger/config

test_pylint:
	@echo "Running pylint..."
	pylint $(TEST_PATHS_MAIN)
	pylint --rcfile=$(TEST_PATH_CONFIG)/.pylintrc $(TEST_PATH_CONFIG)

test_flake8:
	@echo "Running flake8..."
	flake8 $(TEST_PATHS_MAIN) $(TEST_PATH_CONFIG)

test_doctest:
	@echo "Running doctests..."
	@for FILE in $(shell grep -IHm 1 doctest -r ranger | grep $(FILTER) | cut -d: -f1); do \
		echo "Testing $$FILE..."; \
		RANGER_DOCTEST=1 PYTHONPATH=".:"$$PYTHONPATH ${PYTHON} $$FILE; \
	done

test_pytest:
	@echo "Running py.test tests..."
	py.test tests

test: test_pylint test_flake8 test_doctest test_pytest
	@echo "Finished testing: All tests passed!"

man:
	pod2man --stderr --center='ranger manual' --date='$(NAME)-$(VERSION)' \
		--release=$(shell date +%x) doc/ranger.pod doc/ranger.1
	pod2man --stderr --center='rifle manual' --date='$(NAME_RIFLE)-$(VERSION_RIFLE)' \
		--release=$(shell date +%x) doc/rifle.pod doc/rifle.1

manhtml:
	pod2html doc/ranger.pod --outfile=doc/ranger.1.html

cleandoc:
	test -d $(DOCDIR) && rm -- $(DOCDIR)/*.html || true

snapshot:
	git archive --prefix='$(NAME)-$(VERSION)/' --format=tar HEAD | gzip > $(SNAPSHOT_NAME)

dist: snapshot

todo:
	@grep --color -Ion '\(TODO\|XXX\).*' -r ranger

.PHONY: clean cleandoc compile default dist doc help install man manhtml \
	options snapshot test test_pylint test_flake8 test_doctest test_pytest todo pypi_sdist






 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-02 17:54:57 +0000