Add support for Haskell

Patch for support of the Haskell programming language in ohcount

Added a second patch that also needs to be applied. The first one only adds files, but makes no changes to existing ones. Blame my inexperience with git.

Hi tux_rocker,

I'm sorry to say I'm having some trouble applying the second patch. The first patch goes in OK. I'm something of a newbie with git patching, so I might just not understand what is happening, but it looks like the second patch is partially redundant with the first. This is what happens when I attempt to apply the patches (note also my forced stripping of trailing whitespace here):

~/projects/ohcount$ git checkout -b patch f879617036bdd5fd3a3b025152f58886e88b559a
Switched to a new branch "patch"

~/projects/ohcount$ git am --whitespace=strip ~/Downloads/0001-Added-Haskell-support.patch 

Applying Added Haskell support

Adds trailing whitespace.
.dotest/patch:98:{-| 
Adds trailing whitespace.
.dotest/patch:157:ipBytesToString (b1, b2, b3, b4) = 
Adds trailing whitespace.
.dotest/patch:160:{-| 
Adds trailing whitespace.
.dotest/patch:213:                
warning: 4 lines applied after fixing whitespace errors.
Wrote tree aebed2b56a642f003c50e8bd01563e3001108c5d
Committed: 086b4e5b517bae56822cf4ad9c50c25a24334dce
~/projects/ohcount$ git am --whitespace=strip ~/Downloads/0002-Haskell-support.-Includes-non-new-files.patch 

Applying Haskell support. Includes non-new files.

Adds trailing whitespace.
.dotest/patch:23:                        haskell = CMonoglot.new("haskell",         '--',             [e('{-'), e('-}')], true, false)  
Adds trailing whitespace.
.dotest/patch:157:ipBytesToString (b1, b2, b3, b4) = 
Adds trailing whitespace.
.dotest/patch:183:{-| 
Adds trailing whitespace.
.dotest/patch:203:{-| 
error: patch failed: test/src_dir/haskell2.hs:1
error: test/src_dir/haskell2.hs: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
~/projects/ohcount$ git apply ~/Downloads/0002-Haskell-support.-Includes-non-new-files.patch 

I tried various sorts of manual trickery, but I couldn't get it to apply.

I feel your pain with Git, sometimes I get horribly tied up with it, but I need to ask you to make a new, clean patch. Perhaps the best strategy would be to make fresh clone of today's latest code, and manually copy your Haskell changes into it, and then make a new patch from that.

If it really does just get too complicated, I'd accept a tarball, and I can manually apply the changes to my working directory and attribute the commit info to you.

Strange. I applied those patches myself on one system, and it worked without a hitch. I'm going to look into it now.

When manually editing a fresh checkout to include Haskell support, I get:

ohcount$ git add test/expected_dir/haskell1.hs/
The following paths are ignored by one of your .gitignore files:
test/expected_dir/haskell1.hs/ (directory)
Use -f if you really want to add them.

New patch against a fresh checkout

Hi tux,

I have no idea what the .gitignore problem might have been.

I was successfully able to to apply the new patch, and everything seems to be looking good.

I've pushed this patch to the Ohcount main line.

We're a bit backed up on Ohloh today (we had some server troubles over the weekend), so I'll plan to push this change to the Ohloh web site and start recounting the Haskell applications tomorrow (Tuesday).

Thanks!

thanks having a air force ones

http://www.salewroughtiron.cn installing metal stair rails Interior stair handrail installing metal stair rails Interior stair handrail exterior baluster Glass wood stainless wrought CONTEMPORARY designs stairways aluminum modern log banister DECK outdoor price posts vinyl curved rails http://www.china-made-door.com.cn door gate http://www.beijing-door.cn wrought CONTEMPORARY designs stairways installing metal stair rails Interior stair handrail exterior baluster Glass wood stainless wrought CONTEMPORARY designs stairways aluminum modern log banister DECK outdoor price posts vinyl curved rails http://www.hebei-railings.cn aluminum modern log banister DECK outdoor price installing metal stair rails Interior stair handrail exterior baluster Glass wood stainless wrought CONTEMPORARY designs stairways aluminum modern log banister DECK outdoor price posts vinyl curved rails posts vinyl curved rails

china tour Apparel shoes bags Kitchen Food and Wine Furniture) Flowers and Gifts Wall Art Computer Components

I still prefer a wiki like approach since the php (or mysql) docs are very cluttered when you have to take their comments in account. On the other hand they are professionally maintained imho, since they are *much* better than KDE documentation. KDE is by far larger and has so many different apps, which need screenshots and end user not dev/api docs, that more help is needed as long as the devs prefer to code than to write nice docs. And it is their choice to some degree imo. Technically interested but non-dev end users, which are plenty out there, are the users of and the best contributers to the docs, since they know what to write about. And they are certainly more than devs

http://www.about-china.net.cn/catalog.asp?page=2

http://www.about-china.net.cn/catalog.asp?page=1

have no idea what the .gitignore problem might have been.

I was successfully able to to apply the new patch, and everything seems to be looking good.

I've pushed this patch to the Ohcount main line.

We're a bit backed up on Ohloh today (we had some server troubles over the weekend), so I'll plan to push this change to the Ohloh web site and start recounting the Haskell applications tomorrow (Tuesday). ShoesnikeshopWholesaleTrainersSneakers wholesalerSell Salestill prefer a wiki like approach since the php (or mysql) docs are very cluttered when you have to take their comments in account. On the other hand they are professionally maintained imho, since they are *much* better than KDE documentation. KDE is by far larger and has so many different apps, which need screenshots and end user not dev/api docs, that more help is needed as long as the devs prefer to code than to write nice docs. And it is their choice to some degree imo. Technically interested but non-dev end users, which are plenty out there, are the users of and the best contributers to the docs, since they know what to write about. And they are certainly more than devs

Changzhou Sunpower Solar Water Heater Co., Ltd is a private company, professional producing solar water heater, and having the most advanced production line in Chinese, like automatic foaming machine imported from Italy, automatic argon arc welding machine from America, and numerical control punch. We use Germany Bayer's polyurethane and SUS304 stainless steel from Korea and Taiwan. Our company is one of the earliest companies engaging in exporting, having many years experience in exporting, and 90% of our products are exported to overseas market.

Sunpower Solar Energy Industry Co., Ltd, covers an area of nearly 150000 square metre, Now it has more than 300 workers and staff members among which the primary. Medium and high grade technicians share 65% of the total personnel. It is of abumdant technical force, advanced craft testing means. Its annual productive capacity reaches to 300000 sets. Our factory is the first to pass the ISO9001: 2000 quality system attestation among the same trade. Our products have get EN12975: 2 certificate, and all of the products are strictly complied with its standard. The goods reach to the first-class international standard. Now already export 62 counties. Our gain is "Where is sunlight, where is Sunpower". OEM also welcome.

http://www.solar-water-heaters.com.cn

Buying kamagra, viagra and purchase viagra

Replying to add:

china tour Apparel shoes bags Kitchen Food and Wine Furniture) Flowers and Gifts Wall Art Computer Components I still prefer a wiki like approach since the php (or mysql) docs are very cluttered when you have to take their comments in account. On the other hand they are professionally maintained imho, since they are *much* better than KDE documentation. KDE is by far larger and has so many different apps, which need screenshots and end user not dev/api docs, that more help is needed as long as the devs prefer to code than to write nice docs. And it is their choice to some degree imo. Technically interested but non-dev end users, which are plenty out there, are the users of and the best contributers to the docs, since they know what to write about. And they are certainly more than devs

property management marbella

Home Appliances Electrical Equipment & Supplies Apparel Furniture & Furnishings Consumer Electronics Timepieces, Jewelry, Eyewear Health Care Products Toys Stair Railings Staircase Railing Balustrades Handrails Metal Crafts Glass Railing Door,Window & Accessories Luggage, Bags Stainless Steel Railings Aluminum Railing

Interesting Fast size bigger larger penis best penis enlargement